Skip to content

Instantly share code, notes, and snippets.

@minhchu
Created March 22, 2019 03:25
Show Gist options
  • Save minhchu/268bfb42eb94f96218e07e6d3d140b8d to your computer and use it in GitHub Desktop.
Save minhchu/268bfb42eb94f96218e07e6d3d140b8d to your computer and use it in GitHub Desktop.
Resolve conflict on PR
# on feature branch
git fetch origin staging
git merge origin/staging
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment