Skip to content

Instantly share code, notes, and snippets.

@olivierlacan

olivierlacan/github_conflict_resolution.md

Created August 29, 2015 19:03
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save olivierlacan/d1ca5ee1ea83ad538fb1 to your computer and use it in GitHub Desktop.
Save olivierlacan/d1ca5ee1ea83ad538fb1 to your computer and use it in GitHub Desktop.
Download ZIP
I dream of easier merge conflict resolution on GitHub Pull Requests
Raw
github_conflict_resolution.md

Howdy,

It's currently a bit of a hassle (unless I'm doing it wrong) to fix a PR that used to be green but is now unmergeable due to an simple little merge conflict with master.

It would be quite fantabulous if I could access the swanky invisible PR branches from the web interface in order to quickly fix the merge conflict and merge/close the PR without having to:

  • ask & wait for the submitter to fix a conflict they might not understand better than I do (since master likely caused it if the branch is green)
  • tediously add the submitter's repo as a remote and pull their branch, merge master in it to fix the conflict and either submit a PR to their fork or merge it into master directly (which sadly by-passes the existing PR)
  • do the local PR checkout trick (but I'm lazy, don't make me do it!)

A dream solution that would make GitHub even more addictive would be an interactive conflict resolution interface available on PRs that would either mimic FileMerge (:heart:) or simply let users manually resolve the conflict by somehow intelligently highlighting the conflicts that need to be addressed.

Regardless, the experience could be greatly improved, making GitHub even more super duper nice.

Thanks, Olivier

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment