Code owners
Assign users and groups as approvers for specific file changes. Learn more.
merge.md 2.20 KiB
New term: merge
- You have made changes on your branch
- Now you want your changes to be reflected on another branch (most probably
developormaster)
You have to merge the branches.
Remarks: merging is directional - Merge branch A to branch B
The merge is initiated via so called merge request
Requesting someone (from the original repository) to merge your changes.
Use the interface to make use of your peers to review your code!
Our state at the moment?
Time to practice!
- After hitting the Commit button, you get redirected to the submission page for your merge request
- Please make sure that you see that you are proposing to merge your branch (version) into the develop branch. This is shown at the top of the page:
- Fill your merge request submission form and select an Assignee.
- Good practice is to select Delete source branch when merge request is accepted. (Why?)
- Under Changes tab, you can see your... changes :)
