Open main menu

Difference between revisions of "Git tips"

268 bytes added ,  22:14, 12 February 2011
→‎Organization: Add note about official branches
(Corrected spelling)
(→‎Organization: Add note about official branches)
Line 4: Line 4:


Development is done on the ''master'' branch, which is equivalent the the old Subversion ''trunk''. Release branches are branched from, and merged to, ''master''. Tags are always annotated (<tt>git tag -a</tt>) in order to include a timestamp.
Development is done on the ''master'' branch, which is equivalent the the old Subversion ''trunk''. Release branches are branched from, and merged to, ''master''. Tags are always annotated (<tt>git tag -a</tt>) in order to include a timestamp.
Please keep the "official" branches on the scummvm repository to "master" and release-*. If you want to use long-lived branches for other projects, either create them on your own forked repository, or consult the team to decide if they belong in the main repository.


== Dont's ==
== Dont's ==
68

edits