Merge Conflict - Graph View When version control cannot automatically combine changes because different branches modified the same code incompatibly. View concept details Related ConceptsGit Merge Rebase Branch Version Control ← Back to full graph