Lab3: Add Features using Multiple Branches

-

 In this post, I will describe the journey of adding features on the command-line tool named url-fi. This tool helps locate broken URLs in any files such as an HTML page or text file using NodeJS. 

The two features I added this time are the following:

  • Make sure that the program exits with an appropriate error code. If there are no errors (all links are good), exit with 0. Otherwise, exit with a non-zero exit code
  • Support --all, --good, and --bad flags. The --all flag is the default, and if none of there 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

I opened two issues to describe I would add optional features and started working on these. The filed issues are the following:

I worked on these issues parallelly by creating separate branches named issue-10 and issue-11. While I am stuck on issue 10, I switched issue 11 branch and when I am stuck on issue 11, I switched issue 10 branch. When I've done those issues, I merged the codes starting from issue 10. After I've finished merging issue 10, I merged issue 11 code. As it created merge conflicts, I fixed those and then commit the git.


The commits for both issues are the following:
It was attractive I can work two issues at the same time using different branches. It could create merge conflicts which can be confusing for me to fix it but it is helpful I can work parallelly. I got confident I can do better when I should merge two branches creating merge conflicts.

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