Difference between revisions of "Using Git"
Jump to navigation
Jump to search
(Created page with ' ==Merge conflict: Throw away local changes== <pre> git checkout master <path> git commit git push origin <branch> git merge master </pre> Category:Documentation') |
|||
| Line 1: | Line 1: | ||
==Merge conflict: Throw away local changes== |
==Merge conflict: Throw away local changes== |
||
| Line 5: | Line 4: | ||
git checkout master <path> |
git checkout master <path> |
||
git commit |
git commit |
||
git push origin <branch> |
|||
git merge master |
git merge master |
||
</pre> |
</pre> |
||
Revision as of 10:59, 24 September 2013
Merge conflict: Throw away local changes
git checkout master <path> git commit git merge master
