Merge conflicts

This page describes how to resolve conflicts that you may run into while merging your changes.

Resolve conflicts during merging

There are two ways to resolve merge conflicts when they arise:

• Merge using the Prophecy interface
• Use the external Git interface

Let's see in the video below on how to resolve conflicts using the merge function in Prophecy:

Resolve conflicts using manual merge

You can use manual merge to resolve conflicts. This provides you with simple, yet effective ways to resolve merge conflicts for granular changes.

Use Left or Right merge strategy

The Left or Right merge strategy gives you a the option to resolve the conflict by choosing one version of your code to keep. After choosing, you can click Next to continue the merge process.

• (A) Strategy - You must choose a preferred strategy to resolve the conflict. Here the Left strategy keeps the version on branch master, while the Right strategy keeps the version on branch dev.
• (B) Open on master - Clicking this opens the Model on branch master for you to view.
• (C) Open on dev - Clicking this opens the Model on branch dev for you to view.

Here are the read-only views on branch master on the left and branch dev on the right:

Use Code Changes strategy

For SQL, you can also toggle on Code Changes to view and edit the code before validating. You can resolve conflicts by making code changes directly on the files.

Once you've made the changes that you want to keep, click Next. The merge process will compile the files.

Errors caused by conflict resolution

In rare cases, your merge attempt may result in an error after the compile completes. You'll be asked to fix the error before proceeding. See Diagnostics at the bottom for details on what the error is and how you might go about fixing it. Once you've fixed the error, click Try Again.

If you're confident that the errors are fine to leave as is, click Ignore Errors.