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.
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
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.This.
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 usinggit checkout develop; git merge myBranch --no-ff.