Difference between revisions of "Using Git"
Jump to navigation
Jump to search
| Line 12: | Line 12: | ||
git merge master |
git merge master |
||
</pre> |
</pre> |
||
(The last command should now do nothing.) |
(The last command should now do nothing, just say you're fully merged.) |
||
[[Category:Documentation]] |
[[Category:Documentation]] |
||
Revision as of 06:34, 27 September 2013
Removing/undoing your changes to a file
git checkout -- <path>
If "path" is ".", you undo all your changes to version controlled files.
Merge conflict: Throw away local changes
git checkout master <path> git commit git merge master
(The last command should now do nothing, just say you're fully merged.)
