OSD 600 Lab 3

This week we learned how to create new branches and merge them into the master branch. First, we had to pick 2 features from the list to be added to our program. The features I decided to add where: 

  • 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 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.
Then I created issues on GitHub for each feature requesting they for them to be added. The first feature on the list above was issue 9  the second feature was issue 10. After that, I made 2 new branches for each issue and started working! First I added the feature of issue 9 and committed it to this branch. When I finished that I started the next feature (issue 10) and committed to the issue 10 branch. Everything was going well until it was time to merge! First I merged issue-9 with the master branch. But when it was time to merge issue 10 I made a horrible mistake. I wasn't paying attention and merged master into issue 10! The funny thing is there were merge conflicts but I still decided to fix them not realizing I merged to the wrong branch. After that, the code on my main branch got messed up and I had to fix it. One strange thing about this that I can't figure out... there is no pull request for merging master into issue-10. The pull requests for the 2 additional features can be found here and here 
No PR:

This experience taught me to always be careful when merging. Yes, you can always go back in git but this is a mistake that wastes a huge amount of time and can be easily avoided. I also realized taking some time to think and plan what you are going to do with git can pay off. Next time I will be more careful and pay more attention to the actions I am about to do before I start making them. Overall this was a good experience and I cannot wait to try this out again!











Comments

Post a Comment

Popular posts from this blog

OSD600 Release 0.4 Part 3

Image
 This is the last blog for OSD600 and the last part of release 0.4! I am excited to be writing this as after this I will be done with everything I need to do for my classes this semester, and graduate! One issue I noticed while working on this is I did not fully understand what was needed to "port" a component from Gatsby to Next. At first, I thought everything you needed to do to port a component was in this migration guide  posted in the issue . After talking to some people on Slack I learned we must not only follow the migration guide but also convert the JavaScript code in the components to TypeScript. I have worked with Typescript before so I had an idea of how it works/what it is (it's basically JavaScript with types), but I never knew how to convert JavaScript code to TypeScript code. After doing some research I learned this process can be broken down into two simple steps: 1. Change all the .jsx files to .tsx files. 2. Add types to all the variables made. Eg. func
Read more

OSD600 Lab 5

Image
 This week we learned about rebasing in Git! Rebasing is basically taking multiple commits and "grouping" or "moving" them into one commit. Before I started the lab I did the walkthrough on the OSD600 GitHub Wiki. At first, I struggled with it (kept getting errors when running git rebase master -i). Then I decided to start over again and I noticed the first time I forgot to commit some files on the refactor branch. I am happy I did this first because it made the lab go very smoothly.  Before I started the lab I took a look at my code and wrote down the improvements I was planning to make. I decided to do these 3 things: change my regular expression variable from a let to a const, remove an array I never used, and update some functions to use the ES6 arrow syntax. It's been a while since I used arrow functions so I used this resource to guide me Every time I added and tested a feature I did a git commit. One improvement that caused an error was when I updated som
Read more

Release 0.3 PR2

Image
  For release 3 we have to make 2 PR's. The first one must be for the  Telesope project  and the second one must be for an external project. These PR's must "build up" from the PR's we did for release 0.2. This blog post will highlight working on the PR for Telescope. When I started this the first place I went was to the issues page on the Telescope repository. I saw there were some tests that needed to be written and were interested in taking on one of these issues. These were more complex than the test I wrote for the first part of 0.3 so  I saw it as a good opportunity to improve my skill. I asked in Slack for some advice on what to do and was given this idea from David: This seemed like a good test to write (challenging but something I can figure out) so I made an issue for it and started working! When I first wrote the test everything looked fine but it kept on failing. At first, I thought that's good, if we pass an invalid date shouldn't the test fa
Read more