Using Git

From Apertium
Revision as of 10:59, 24 September 2013 by Francis Tyers (talk | contribs)
Jump to navigation Jump to search

Merge conflict: Throw away local changes

 git checkout master <path>
 git commit
 git merge master