0

This is the situation:

  • John creates a fantastic app and pushes the code to Bitbucket, we call this repo aww

  • Alan checks out the master branch of aww, does some awesome changes, and creates a pull request from master to master of the aww repo

Alan becomes unavailable.

There are conflicts.

Please how does John fix the conflicts and merge the work of Alan?

Thank you.

OTHER INFO/EDIT

John tried very hard to checkout the pull request following this post but he is really not able to do it and from this other post it appears to be impossible.

Community
  • 1
  • 1
Lisa Anne
  • 4,482
  • 17
  • 83
  • 157
  • 1
    Use git log on Alan code and get the commit id and fetch it locally. than try merging and push the changes to master. – Nish Feb 28 '17 at 15:53
  • Thank Nishh but how can I do git log on a remote pull request? Is it possible? – Lisa Anne Feb 28 '17 at 16:51

0 Answers0