Freelance web-developer. Works mostly with React. Implements accessible, responsive web applications. Loves functional programming patterns. Does not love TypeScript.
If you revert a merge commit and later on you want to "re-merge" that same branch, you should revert the earlier revert commit (the commit that reverted the first merge) which effectively restores that merge. And if you have new commits in the feature branch since you merged for the first time you'll have to git merge <feature> again.
So:
You create a merge: git merge <feature>
You revert that (creating a new commit, say, <revmerge>): git revert -m 1 <mergecommit>
Later, you revert the revert: git revert <revmerge>
And merge in any changes to after the initial merge: git merge <feature>
There is a nice explanation here: git-scm.com/book/en/v2/Git-Tools-A... Look for the "Undoing merges" section further down.
If you revert a merge commit and later on you want to "re-merge" that same branch, you should revert the earlier revert commit (the commit that reverted the first merge) which effectively restores that merge. And if you have new commits in the feature branch since you merged for the first time you'll have to
git merge <feature>again.So:
You create a merge:
git merge <feature>You revert that (creating a new commit, say,
<revmerge>):git revert -m 1 <mergecommit>Later, you revert the revert:
git revert <revmerge>And merge in any changes to after the initial merge:
git merge <feature>Ah, this is the piece of documentation I was missing on Thursday, thanks for that!