68
edits
Difference between revisions of "Git tips"
Jump to navigation
Jump to search
→Organization: Add note about official branches
(Corrected spelling) |
Salty-horse (talk | contribs) (→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 == | ||