Skip to content

Instantly share code, notes, and snippets.

@li2

li2/c.md

Last active May 6, 2018 11:42
Show Gist options
  • Save li2/216bcfe00d27652960110648aae0288e to your computer and use it in GitHub Desktop.
Save li2/216bcfe00d27652960110648aae0288e to your computer and use it in GitHub Desktop.
Download ZIP
Fix git merge conflict #tags: git
Raw
c.md

Merge conflict Close This pull request has conflicts.

You must resolve the conflicts by manually merging release/R1804 into this branch. After the conflicts are resolved you will be able to merge the pull request.

Step 1: Checkout the source branch and merge in the changes from the target branch. Resolve conflicts.

git checkout branch_name
git pull origin release/R1804

Step 2: After the merge conflicts are resolved, stage the changes accordingly, commit the changes and push.

git commit
git push origin HEAD

Step 3: Merge the updated pull request.

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