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 Lab 8 & 9

Image
Lab 8 involved writing tests for our link checker programs! Unlike other labs, this ran for two weeks and consisted of two parts! For the first part, we had to write some tests for our program, and for the second part, we needed to write some tests for another person's program. The testing framework I chose was jest . The two main reasons I chose this was because it's the most popular testing framework for Javascript, and I already had some experience working with it during release 0.3. Another tool I used was the npm module nock . This was so I can make mock requests to websites. Setting up both was pretty simple once I read the documentation. After installing jest make a test file. For example, if you wish to test functions in index.js make a file called index.test.js . To run the test run the command npm run test. Also, make sure in package.json   you add "test": "jest" in the "scripts" section. Nock doesn't require much setup besides requi...
Read more

OSD600 Lab 6

Image
This week we started to get familiar with Telescope  a tool made by students of OSD 600 to track blogs written for Senecas Open Source class. The first task of this week's lab was to set up telescope and get it to run on our local machine. I first read the envirenmet-setup.md file and decided I will use the docker and docker-compose method. After I forked and cloned the repository I downloaded docker decktop (this comes with docker and docker-compose) then followed the steps to run it. I did run into some minor issues when trying to run it, but was able to figure it out!  After I got that working I started the second part of lab 6. For this part, we had to modify our link checker to search for links in the last 10 telescope posts. To be honest, at first, I had no idea how to do this. But then I took a minute to think about it and start writing some code (It's easier for me to visualize). Eventually, I figured it out! I used fetch() to grab the JSON data from http://localhost...
Read more

OSD600 Intro Post

Introduction: Hello, my name is Joey and I am a student at Seneca studying Computer Programming. My whole life I have always been interested in technology. Towards the end of high school, I enrolled in Computer Science and enjoyed the subject. My passion for technology and love of code persuaded me to get an education in Computer Programming. Why Are You Taking this Class? I am taking this class to help widen my skill set and also because I have always been interested in Open Source. I know many programming technologies such as Java, C++ and SQL but I don't know anything about Open Source. It has been a goal of mine to learn but never had the time to look into it. Therefore, I decided to take this class as I believe this is one of the best opportunities to learn!  What is it About Open Source that Attracted You? The freedom the comes with it. I am fascinated by the idea that anyone can take my code and work with it, and I can do the same to theirs. I believe the more people that co...
Read more