News for hackers. Stuff that matters.
Re:A Git catastrophe cleaned up by sampo on Wednesday December 21, 2016 @01:29PM (#13231407)
If you were in master when you merged bugfix in ("git merge bugfix"), then you can

  git cat-file -p master
and see which commit, A or B, is listed as the first parent. This belongs to the master.

There are no comments on this comment yet.