re: Rebase or merge VIEW POST


IMO, ideally you would use both. Create a branch and make commits for your changes, but when you are ready to add those changes back into 'master', you should first rebase. This illuminates any diffs from the current standard and the changes you have made, including any branches you have merged into your working branch. When the PR is approved, you can then squash commit so there is a single commit with all the changes you have made.

Code of Conduct Report abuse