Documentation / Branches
Merge or throw away
Tried something in a branch? Then you choose: you like it and it goes into the main line, or you throw it away.
Merging
- 1Choose the branch
Open Window, Branches and choose the branch you want to take over. - 2Click Merge
Click Merge. - 3Settle clashes
If the same field has also changed in the main line, you choose per field: Keep main line or Take branch. - 4Confirm
The changes land on the main line as one step. With Ctrl+Z you reverse it in one go.
Discarding
Click Discard and confirm. All changes of the branch disappear from view. Your main line was never changed.
Stuck? Email [email protected].