154
edits
Changes
→merge
To '''commit''' is to apply (that is, to copy) your modifications and additions to the repository server.
==== merge ====
To '''"merge"''' is to merge back a branched directory, back to the original directory; that is, to apply to the original directory those modifications and additions that you have made to the your '''branch'''ed directory.
: '''merge''' is the opposite of '''branch'''.