Skip to content

Instantly share code, notes, and snippets.

@nara-l

nara-l/fixing_merge_before_pull_request

Created July 5, 2018 19:16
Show Gist options
  • Save nara-l/24ee00766da0f0c3cdf3bc4bdbbb6548 to your computer and use it in GitHub Desktop.
Save nara-l/24ee00766da0f0c3cdf3bc4bdbbb6548 to your computer and use it in GitHub Desktop.
Download ZIP
Git - Fixing conflict between master and branch before pull request
Raw
fixing_merge_before_pull_request
git fetch origin # gets latest changes made to master
git checkout branch_name # switch to your branch
git merge master # merge with master
# manually resolve any merge conflicts here
git push origin branch_name # push branch and update the pull request
# branch_name is the name of the branch you you have the conflict on
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment