Today was a slow day for me challenge wise. It was my first full day back to work after attending a full week of training, and obviously after a much needed weekend. That said, I should do something still, so today was about keeping my git repos updated an in sync with their respective upstream(s). In the case of wthr.py , the repo I’m currently contributing to and sending pull requests, I needed to figure out how to pull down the upstream changes into my repo, and maintain a clean git log that shows the commit history in a clear and concise state.
I did some digging around, and here’s the magic:
Simply put, this pulls all the changes down from the upstream, rebases my local repo to match the modifications on the upstream repo, then pushes those changes back up to my fork. Even though I use git on a regular basis, I think it’s important that during this challenge I also gain a clear understanding of the tools that support software development, since those will be employed just as much as the code I contribute. A small contribution towards the challenge, I know, but it’s an important one to begin to truly understand. Tomorrow, I go hard.