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

Lab 8: Automated Testing and Continuous Integration

-
When I developed a program, it was time-consuming to test all the functions I created when I add a feature. I needed to run each feature, check whether it gives expected output or not, and check all the output. It is possible I forgot to test a feature and later on, I realize I did not test the feature. I wonder if there any ways I can do it automatically. Now, I got the way how to do that. There is automated testing for it! To begin with it, I started searching the testing framework to apply my command-line tool named url-fi. There are some testing frameworks for Node.js such as Jest, Mocha, and AVA. The testing framework I chose is  Jest  which is a testing framework developed by Facebook. I've installed Jest running 'npm install --save-dev jest' and test whether it works properly or not.  This document  is the way I followed to install the Jest testing framework. After I've installed the Jest testing framework, I worked on separating functions. As my tool contains al
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 project
Read more

Project: Final

-
Introduction In this post, I will describe the summary of how I have done each stage. The purpose of this post is for wrapping up this project. The purpose of the project is the optimization of one open-source project. I need to compile, benchmark, profiling, and optimize the software. The detailed information about the project is described in the  SPO600 winter project .  Previous posts related to this project The previous posts for this project are listed below. You can read the detailed steps of how I have done each stage. Stage 1 Project Stage 1 - Compiling and Benchmark Butteraugli Stage 2 Project Stage 2 - Profiling Butteraugli Project Stage 2: Profiling (x86_64) The links for the results Project: Organize the Results Stage 3 Project Stage 3: Optimization Stage 1 Stage 1 is for building and benchmarking the performance of an open-source software package. There are some requirements for the open-source package I need to consider. Firstly, the time for testin
Read more