nhattan/gist:0c208c23674a8dea883c

Last active August 29, 2015 14:20

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/nhattan/0c208c23674a8dea883c.js"></script>
Save nhattan/0c208c23674a8dea883c to your computer and use it in GitHub Desktop.

Download ZIP

Solve conflict

Raw

gistfile1.md

Solve Conflicts

Get newest code from upstream/master to your master branch

git checkout master
git pull upstream master

Checkout to current task and rebase with master branch

git checkout your_task
git rebase master

After resolving all conflicts

git add . 
git rebase --continue
git push origin your_task -f

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