0

Here is my scenario.

I'm working with a team and I do not know who makes a mistake in the last merge/rebase. All I need is revert this commits completely and the issue is I do not know how many commits were involved. It is too hard to ask which developer was the previous merge before the last one.

If there any ideas? I completely lost the track in the develop branch, and the local is not updated.

Just to clarify I do not have the commit hash. It is not the same situation for this question. How to revert a merge commit that's already pushed to remote branch?

AndroidStorm
  • 859
  • 9
  • 25
  • git bisect is your friend. – lilezek Oct 17 '17 at 17:37
  • One merge is one commit, and you should be able to see from the history who did any of the merges. – crashmstr Oct 17 '17 at 17:42
  • my example is not related with one commit sorry... a merge can be a lot of commits, for example a git-rebase – AndroidStorm Oct 17 '17 at 18:59
  • rebase != merge, one merge is one commit (i.e. the merge itself is *one commit* that merges one branch into another, and may have changes from many commits, but the merge itself is one single commit). – crashmstr Oct 17 '17 at 19:05
  • In other words: if your team is using rebase instead of merge, this is a very different thing than your question appears to be about and should be part of the question. – crashmstr Oct 17 '17 at 19:22
  • 1
    What about checking the reflog? – Julian Oct 17 '17 at 20:29

0 Answers0