MENU
You have an Azure Databricks workspace named Workspace1 that contains a Git folder linked to a remote Git repository. The Git folder contains a Databricks notebook named Notebook1.
From the main branch, you create a feature branch named Branch1 and commit changes to Notebook1.
Another user commits changes to Notebook1 in main.
When you attempt to merge Branch1 into main, a merge conflict occurs.
You need to ensure that Notebook1 in main includes the changes from both branches.
What should you do?
Branch1 must first incorporate the current changes from main. During that merge, the conflicting sections of Notebook1 can be reviewed and resolved so that the resulting feature-branch version contains the required work from both branches. After committing the resolution, Branch1 can be merged into main normally. Cloning either branch into another Git folder creates another working copy but does not resolve the conflicting histories. Applying changes directly to main bypasses the controlled feature-branch workflow and risks omitting or overwriting one contributor's work. Resolving the conflict on Branch1 also allows the combined notebook to be tested before updating the shared main branch. Therefore, merging main into Branch1, resolving the conflict, and completing the final merge is the correct workflow.
Currently there are no comments in this discussion, be the first to comment!