1,079
edits
Difference between revisions of "Git tips"
→Don'ts: Mention restriction of branches on the main repository
Salty-horse (talk | contribs) |
(→Don'ts: Mention restriction of branches on the main repository) |
||
| Line 11: | Line 11: | ||
* '''Never ever''' use '''''git push -f''''' without discussing it on the mailing-list. That operation deletes commits from the server, and will cause problems to others working with the repository. | * '''Never ever''' use '''''git push -f''''' without discussing it on the mailing-list. That operation deletes commits from the server, and will cause problems to others working with the repository. | ||
* Try to not create pointless merge commits. This will be explained in the [[#Workflow]] section. If you do make merge commits, the branch you're merging should include commits that are "bunched together" on purpose. This makes them easier to review or revert. | * Try to not create pointless merge commits. This will be explained in the [[#Workflow]] section. If you do make merge commits, the branch you're merging should include commits that are "bunched together" on purpose. This makes them easier to review or revert. | ||
* Do not create additional branches on the main scummvm repository without first consulting with the rest of the team. | |||
== Workflow == | == Workflow == | ||