Merge conflict
Two branches that changed the same lines, where the tool cannot choose. The markers show both sides and your job is to pick one, not to delete the block.
- See also: Branch
- See also: Rebase
- Used in: Git & Version Control
Two branches that changed the same lines, where the tool cannot choose. The markers show both sides and your job is to pick one, not to delete the block.