0

10 days ago I accidentally merge a feature branch (feature/calendar) into develop branch. After that I revert it.

In between, the were some commits made on both branches.

Now, I want to merge feature/calendar into develop. The issue is that the changes made by the revert (10 days ago) are posterior to the current work, so when I make a diff between the 2 branches the work previously reverted is missing.

What can I do?

Thank you.

jody_lognoul
  • 817
  • 7
  • 15
  • Not sure if I understand correctly - can you not just rebase your feature branch and then merge into develop? `git fetch origin/develop && git rebase origin/develop` – Tony Barnes Jan 03 '17 at 10:09
  • @jody_lognoul Can you attach a demo example of what you want actually? – Sajib Khan Jan 03 '17 at 10:25
  • Yes it's the same issue as here: http://stackoverflow.com/questions/1078146/re-doing-a-reverted-merge-in-git thank you btw :-) – jody_lognoul Jan 03 '17 at 10:32

0 Answers0