re: Rebase or merge VIEW POST


My current preference is to rebase feature branches, then merge those using --no-ff. This makes sure there are no conflict resolutions in the merge commits (because those were resolved while rebasing), but still groups related commits together.



We have a master and develop branch. And when I'm writing a feature in say... "myBranch". I will rebase develop onto my branch then merge back into develop using git checkout develop; git merge myBranch --no-ff.

Code of Conduct Report abuse