Merge Conflicts

Merge conflicts arise when two branches have changes that Git cannot automatically merge. This situation commonly occurs when:

• Two branches have changes in the same part of a file.

• One branch has changes, and the other branch deletes the same file.

• Both branches have changes, and Git can't determine which changes should take precedence.

Using Merge Conflicts in Paradime

To use merge conflict, follow the step below:

1. Open a Pull Request

Click the git icon on the right panel to open the Git User Interface, and then commit and push your changes. Note: The visual tutorial below is for GitLite users, but the merge conflict feature works for Git Advanced users as well.

2. Resolve Merge Conflict(s)

Paradime offers various options to resolve merge conflicts:

• Abort Merge - Cancel the entire merge process if conflicts are significant or challenging to resolve.

• Accept Current Changes - Accept and apply the changes made in your branch.

• Accept Incoming Changes - Accept and apply the incoming changes from the target branch.

• Accept Both Changes - Combine and apply both sets of changes – yours and the incoming changes from the target branch.

• Compare Changes - Visually compare the changes made in your branch with incoming changes from the target branch.

3. Commit and Resolve

Once you've decided how to resolve the merge conflict, proceed with your pull request by clicking the git icon in the right panel, "Commit and Resolve" and then "Open Pull Request".

‍