OSD Lab3 Git Merge

In this lab, I need to implement two additional feathers into my release 0.1 project -- urlStatusChecker. I am asked to do each of the feathers in its own branch and then merge them into my master branch in order to learn and get familiar with the git merge processes.

I choose to add two of the following  features into my  urlStatusChecker:

  1. Add a -j, --json, and/or \j flag, which causes the program to output JSON. The JSON output should look like [ { url: 'https://www.google.com': status '200' }, { url: 'https://bad-link.com': status: '404' } ]
  2. Support --all, --good, and --bad flags. The --all flag is the default, and if none of these are present, it will display good and bad URLs. The --good flag causes only good URLs to get displayed; the --bad flag causes only bad URLs to get displayed

To begin with, I issued the two feathers that I wanted to add in my repository( Issue-5, Issue6). Then I created two new local branches using the command git checkout -b issue-5/issue-6 master. After I implement both feathers and committed them in their independent branch, I merged them one by one. 

When I tried to merge my issue-5 branch into my master branch, it works smoothly and successfully since it was a fast-forward merge. 



However, issue 6 branch caused a few conflicts during the merge.




Since I have added function arguments in both issue5 and issue6 branch, I can only merge them manually. I noticed that after I did the manual merge, all the files I had changed display in blue color.
    

Finally, I typed the command "git commit" to finishing my issue6 merging.

After I pushed my final code into my GitHub, I am able to check the issue 5 commit, issue6 merging commit in Github too.

After this lab, I have a better understanding of Git merging process. I also feel that make code looks more consistent when send pull requests might helps Git to do auto merging easier.

Comments

Post a Comment

Popular posts from this blog

My PR for release 0.3 External Project

Image
 Picking the issue I am so glad to hear that we are allowed to work on repositories that  we have already worked on in the past. That means we don't need to spend time on set it up and learn the code. I decide to work on  issue-collab  since I am so familiar with the repository. Different than any other issue I have work on, I filed the new issue-76 myself and tried to create a pull request for it. The issue I filed is that add a scroll to the top button. I am trying to add the scroll to the top button into this issue-collab repository just like the one in Telescope. The owner of Issue-collab thinks this is a good idea too. Working on the issue The first time when I tried to work on it, I just tried to study the code from Telescope and some from google and playing the code around. I was so annoying that I can't put some code together successfully in React. After watched some React video, I realized that there are two different components which are Class components and Function
Read more

OSD600 Lab8

Image
OSD600 LAB8 In this lab, we were asked to add unit tests, code coverage analysis, continuous integration to my open source project  urlStatusChecker .  we were also asked to add Tests to Another project. Choose and Set Up a Testing Framework Since my command-line tool is written in javascript, I choose Jest as my testing framework. It is a famous javascript testing framework that works with projects using: Babel, Typescript, Node, React, Angular, Vue, etc. I  know that Jest contains a code coverage analysis as well, so it is the perfect option. I simply use the command " npm install --save-dev jest " to install it and start writing my unit test. Write My First Test I have never write any unit tests before. After I watched this week's video, I have a basic concept of what is unit testing, integration testing, end to end testing. I chose the  simplest   function  in my project to begin to write my first unit test.  const   goodUrl  = ( urlString )  =>  {    const   PATT
Read more

OSD600 -- Release 0.4.1 -- Choose Project and issues

Release 0.4.1 -- Choose Project and issues For this release 0.4, we keep contributing to the open-source projects with larger/more pull requests. The next couple weeks would be very busy for me and I don't want to spend too much time on finding projects, and setting developer environments, so  I chose to keep contribute to  Telescope  for my last release. I have checked all the issues on the Telescope repository, and I found one I really want to work on Issue-1416  Improve Mobile Usability by adding a bottom app bar Sadly, it was picked by one of my classmates.  However, there are some front-end enhancements/bugs that I can work on.  I will start my release 0.4 by adding/fixing those  enhancements/bugs and keep finding all  related   enhancements/bugs to improve the overall front-end of the project. These are the issues I am currently working on: Issue-1424  Fix font colours in GitHub Contributor component Issue-1426   Scroll To Top button doesn't move to correct position Issue
Read more