Literally, I feel like the only thing I didn't use was rebase and that's coming in the next lab.
Anyway, for this week's lab, we were asked to implement a new feature for someone else's repo. Simple enough. The catch: No PRs allowed. We had to use branches to watch for updates, then merge them into our master branch before finally committing them to our github repo. Probably one of the most convoluted labs I've ever done. Git ready for the long haul (Too many puns, I'm sorry :D)
Anyway, the feature was an ignore feature that checks to make sure that the program skips all urls indicated inside the mentioned ignore_url file. I implemented this case for Mo (https://github.com/Metropass), strictly because he approached me asking if we could implement this feature for each other since we both did our release 0.1 in python. I figured, why not. The feature itself was not that difficult to implement, although I had to learn how click really worked since I dropped it for my release 0.1 while he went with it. Interesting library, I'll say.
The main issues I had were with setting up branches to watch the other. There were alot of times where my attempts to fetch would result in nothing actually being fetched. 
I also had merge conflicts that I had to resolve as well as this peculiar issue 
It was a very unpleasant experience, especially whenever we had an issue that we had to resolve. Eventually, the feature I made worked to perfection and I had him fetch, merge, and push, which thankfully worked very quickly.
This lab really made me value PRs alot more than I used to. The ability to see the merge conflicts as well as comment on what potentially needs to be changed is something I'll never take for granted ever again. While I believe I learned alot about the git options we needed for this week's lab, I just don't ever see myself going through this hell ever again, unless of course, my future workplace insists. I'll just pray that day never comes until then.
Next time, release 0.2 PR #2. Hopefully, it's less difficult than this lab was lol. Until next time!
Top comments (0)