Your first contribution to an open source project can be a very rewarding experience. Once your feature, fix or enhancement as part of a Github pull r

Git rebase, squash...oh my!

submited by
Style Pass
2021-06-11 13:00:09

Your first contribution to an open source project can be a very rewarding experience. Once your feature, fix or enhancement as part of a Github pull request1 (PR) is merged, your brain is likely going to start looking to solve the next problem in open source land with your newly acquired git foo 🙅‍♀️

If you’ve already went through this exercise though, you also know that mastering the git Swiss Army knife, and related code collaboration platforms (Github, etc.), might feel like black art and overwhelming. This is especially true, when things go south, e.g. the reviewer requests changes to your code.

But even in the case where your code contribution is fine, the reviewer(s) might ask you to perform additional steps on your commits before accepting (“merging”) them into the upstream (“target”) repository.

Let me tell you that I’ve been in the same situation several times, both as a contributor and reviewer, e.g. on the VMware Event Broker Appliance (VEBA) project.

Leave a Comment