Created
March 22, 2019 03:25
-
-
Save minhchu/268bfb42eb94f96218e07e6d3d140b8d to your computer and use it in GitHub Desktop.
Resolve conflict on PR
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# 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