Merge
Also called: Merge conflict
Bringing the commits from one branch into another, usually into main after a pull request is approved.
Definition
After a merge, the next build of the target branch contains the change. When two branches changed the same lines, a developer has to resolve a merge conflict by hand.
In practice
PR #418 was merged as commit 7f3d0b1, so the next staging build, 412, contains the fix.
Learn it in context
Lessons that use this term.
Related terms
- BranchA separate line of work in a repository, so a change can be built without affecting everyone else.
- Pull requestA request to merge a branch's changes, with code review and automated checks. GitLab calls it a merge request.
- BuildA specific compiled version of the app or website that is ready to be installed or tested.