Skip to content

Instantly share code, notes, and snippets.

@0x3bfc
Last active August 20, 2019 09:26
Show Gist options
  • Save 0x3bfc/1016e457079ea6b1cdf7c22fb8f73ce4 to your computer and use it in GitHub Desktop.
Save 0x3bfc/1016e457079ea6b1cdf7c22fb8f73ce4 to your computer and use it in GitHub Desktop.
This is a sample commands in which resolve the git branch conflict manually through command line.
git checkout -b feature/whitelisting-merge origin/feature/whitelisting
git merge develop
git status
// fix conflicts
git add .
git commit -m 'resolve conflict'
git status
git checkout feature/whitelisting
git merge --no-ff feature/whitelisting-merge
git push
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment