Resolve Merge Conflicts

Introduction

You should know

A merge conflict arises when two Analysts make changes in the same line in a file, or one Analyst deletes a file but another Analyst makes edits in the same file.

Merge conflicts are bound to happen when you pull changes from other branches. Should this happen, Holistics will use the standard Git syntax conflict markers to display conflicts during merging.

The merge cannot be executed automatically because Git cannot determine which changes to keep, so you will need to resolve the conflicts manually.

How to resolve merge conflicts

1. Select which changes you want to keep: their branches, your branches or both. If you want to discard a change, simply delete the corresponding code section.
2. Then, Delete the conflict markers.
3. Commit your changes.