Lab4: Practice git remotes and merges

-

 In this post, I will describe the journey of lab 4 which practices git remotes and merges. Here is the instruction of the lab4. The purpose of this lab is to practice the following:

  • creating branches to work on new features and fix bugs
  • working on code changes in another project you didn't write
  • using git remote and sharing commits with git push, git pull, and git fetch
  • using git merge and doing practice merges
  • fixing merge conflicts

The additional feature I need to add to the existing project was to ignore URL. For example, if I enter 'tool-name --ignore ignore-url.txt test.html', the tool will check all the URLs inside the test.html file without the URLs inside the ignore-url.txt file. To begin this lab, I look around the whole the projects on the release 0.1 list and picked up one project. 

The process was similar to previous labs. I forked the repository, created a new branch named issue-9, wrote the code to add a new feature, pushed the commit into the new branch, and pulled the request. I asked the author to assign me to this issue and review my code October 13th but I did not get any responses. I pulled request to his repository on October 16th and am waiting for his review.


While I am working on the lab4 using the project named Webpage-status-checking-tool, I got an issue with the additional feature on my project. I assigned the issue to him so he can work on this issue. He pulled the request and I reviewed the commits he pushed.

While I am reviewing his commit, I can practice using git remote and sharing commits with git push, git pull, and git fetch. Before I learned these, I just forked the repository somebody forked my repository to review the code. When I used git remote to get the commits, it makes the work much easier! It is faster to get code and easier to compare the previous and current codes. It was amazing!

I kept communicating with tianlangwu (GitHub username) for the new feature (ignore argument) because his code made some bugs. We talked about these for 2 days and now it works! I did 'git pull tianlangwe issue-12' to merge his code and resolved the conflict. Now he is the contributer of my project. Thank you for adding a new feature on my project, tianlangwu!

I got a small struggle while I was working on this lab. When I tried 'git checkout -b [branch name I want to create] [remote name]/[branch name]', it created some errors because I did not 'git fetch --all' after I added remote. I resolved this fast when I reviewed the lecture again and googled this error. I got confident I will reduce the time for creating a branch linked with another person's branch in the future.

Comments

Post a Comment

Popular posts from this blog

Release 4.0 - Part 3: Release

-
In this post, I am going to describe the journey of the release 4.0. Release 4.0 is the 3 weeks project. In the first week, I chose the project to work on. As the issue I chose required knowledge I do not have any idea (Gatsby and Nextjs), I need to learn these. In the second week, I learned the Gatsby and Nextjs to read the document on the Next official website. Also, I checked the pull request other people already created for the project. And this week, I started writing codes to resolve the issue. It was hard to begin to migrate the pages from Gatsby to the Nextjs. I needed to google a lot to find the proper way to migrate the code for the project. The components I was assigned are Error page, SEO, and SearchHelp components. The SEO component is relatively easy because the Next official website indicated how to do it most. However, the Error page is the most difficult part for me. When I googled how to make the Nextjs Errorpage, most people recommend to use the JavaScript extension ...
Read more

Hacktoberfest: Second Pull Request - wanikani-notifier

-
 This post describes the journey of the second pull request for Hacktoberfest which encourages new people to get involved in the open-source community. The post for the first pull request for Hacktoberfest is the following:  https://hyunjijanelee.blogspot.com/2020/10/hacktoberfest-first-pull-request-tower.html In this time, I have struggled to find an issue to work on. Most of the issues I would like to work on are already taken to another person and other issues have some problems on the project so I cannot run it properly. I kept finding a proper project and found one project named wanikani-notifier. The link for the wanikani-notifier is the following:  https://github.com/upsetdog/wanikani-notifier When I found an issue with this project, I cloned the project to check whether I can run this project. At that time, I found it has another issue to make it better. On this project, there is no 'package-lock.json' file so users need to install modules checking what modules ar...
Read more

Open Source Project: Lab2 (Pull Request)

-
Image
 Introduction In this lab, I practiced contributing and submitting pull requests to other repositories I don't own. Following the lab instruction , the things I plan to practice are the following: forking and cloning other projects creating branches to work on new features and fix bugs working on code I didn't write, trying to maintain the original style and not break things creating pull requests collaborating with other developers on GitHub updating my pull requests to include fixes for review comments The Project I picked for pull request ( https://github.com/lixiaoqity/testLink/pull/7 ) I looked around the classmates' open source project and picked the project named testLink. The GitHub repository link is the following:  https://github.com/lixiaoqity/testLink/pull/7 .  I picked this project because it also uses the NodeJS which I picked for my project. It was really interesting to see how code can be written differently for the same subject. When I look over the proje...
Read more