Two weeks ago you reverted a bad merge. Now the feature is fixed and you want to merge it back — but Git acts like it's already merged and brings in nothing.
The revert commit cancels the feature. You have to revert THAT revert before re-merging.
Expert · 4 steps · +850 XP
This scenario walks through 4 steps, in order:
Try the terminal first — you learn more by doing. When you want to check yourself, here is the command for each step.
git log --onelinegit revert rr00003git merge feature-fixedgit push origin mainRevert-the-revert is the Git-idiomatic way to bring a reverted merge back to life.