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 third pull request for Hacktoberfest

Image
Picking the Issue Since I never deal with bugs for my first and second pull request, I decided to find a bug issue to work for my third pull request. The funny thing is that I just noticed that one of the contributors of my second PR's project  issue-collab  listed a bug about " Page not reloading after clicking next on pagination ". The owner of the repo wants someone to share a video/gif about the issue because he not really clear what the bug exactly is. I tried and uploaded the gif of the bug.  Then the owner reproduced it as following: Click Find Issues Scroll to bottom of page and click Next page Click Find Issues again (observe it doesn't work) Click Find Issues a second time (observe it loads the first page) I asked him assigned the issue to me and he did it immediately. Practice the git commands I checked the requirement of release 0.2, and I am able to work on at least 3 different repos for my PR. That means I can work on this repo twice plus 2 more differe...
Read more

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 compone...
Read more