Question

A data engineering team uses Databricks Repos linked to a remote GitHub repository. Two engineers are working on separate feature branches derived from 'main'. Engineer A merges their pull request into 'main' first. When Engineer B later attempts to merge their pull request, GitHub reports a merge conflict on the same notebook. What is the recommended way for Engineer B to resolve this within a proper Git workflow before merging?

Accepted Answer

Pull the latest 'main' into Engineer B's feature branch, resolve the conflicting changes locally/in the branch, commit the resolution, and push before merging the pull request.

Answer

Delete Engineer B's feature branch and re-create it from 'main', then manually re-type all the changes so no conflict can occur.

Answer

Force-push Engineer B's feature branch over 'main' so that Engineer B's version overwrites Engineer A's merged changes.

Answer

Detach the Repo from the remote and copy the notebook into a separate workspace folder to avoid the conflict entirely.