Merge Workflow: Difference between revisions
Appearance
m rollbackEdits.php mass rollback Tag: Rollback |
LongnoseRob (talk | contribs) update to gitlab.postmarketos.org |
||
Line 1: | Line 1: | ||
This page used to describe the merge workflow on GitHub and reasoning for always using "squash and merge". Nowadays we are on GitLab and have a tool to assist us with the merge workflow. From the user's perspective, you only need to know that commits are squashed into one commit if they don't have a clean history. | This page used to describe the merge workflow on GitHub and reasoning for always using "squash and merge". Nowadays we are on GitLab and have a tool to assist us with the merge workflow. From the user's perspective, you only need to know that commits are squashed into one commit if they don't have a clean history. | ||
For people responsible of merging patches, see [https://gitlab. | For people responsible of merging patches, see [https://gitlab.postmarketos.org/postmarketOS/mrhlpr mrhlpr] for our merge workflow. | ||
Related: [[Git workflow]] | Related: [[Git workflow]] |
Latest revision as of 05:01, 3 November 2024
This page used to describe the merge workflow on GitHub and reasoning for always using "squash and merge". Nowadays we are on GitLab and have a tool to assist us with the merge workflow. From the user's perspective, you only need to know that commits are squashed into one commit if they don't have a clean history.
For people responsible of merging patches, see mrhlpr for our merge workflow.
Related: Git workflow