Solving Git Errors

There will be times when you’ll need to fix errors before you can merge your changes.

Merge Conflicts

There will be times when two branches or commits can't be merged, because of conflicting data. Let's go through a simple example to illustrate this.

On my main branch, I have a transform in my STG_CUSTOMER node to LOWER() the C_NAME column. On my stage_nodes I've done the same, except this time I'm using UPPER() instead. These are mutually exclusive changes, and attempting to merge the stage_nodes branch into main will result in a conflict.

📘

Tip: Searching for Merge Conflicts

You can use your operating system's search functionality within the Merge Conflict Window by clicking CTRL + F or Command + F once your cursor is in the text box.

To resolve the merge conflicts, remove the conflicting code lines and all conflict markers. See the screenshot below for an example.

There times that conflicts are too complex to resolve within Coalesce and require going through the git provider's platform to resolve before merging the branches/commits. Our system will make you aware if this is the case and warn you accordingly. If you have a use case where you're running into this situation often, please reach out to our Support team.

Parsing Errors

Parsing errors occur when there are syntax errors. For example missing commas and extra quotes.

When a parsing error occurs, the Git Modal will open a Parsing Error screen and jump to the error message. There you can fix the error then merge your changes.

Validation Errors

Validation errors occur when there are semantic errors. Such an something being an array when it should be an object. These types of errors tend to be introduced outside of Coalesce.