Using Git

From Apertium

Revision as of 10:58, 24 September 2013 by Francis Tyers (talk | contribs) (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')

(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)

Jump to navigation Jump to search

Merge conflict: Throw away local changes

 git checkout master <path>
 git commit
 git push origin <branch>
 git merge master

Retrieved from "https://wiki.apertium.org/w/index.php?title=Using_Git&oldid=43901"

Documentation