Conflict Resolution

Using Databricks Repos

New Operations: Merge & Rebase

• Merge and rebase are methods to combine commit histories.
• Merge keeps the original history, Rebase creates a linear history.
• Databricks Repos supports both methods, catering to different preferences.

Understanding Merge Conflicts

Causes of Merge Conflicts

• Occur when Git cannot auto-merge code from different branches.
• Commonly happens when the same lines of code are modified in different branches.
• Requires manual intervention for resolution.

The Rebase Operation

• Rebase updates your branch with commits from the main branch.
• Can result in merge conflicts if there are competing changes in the local and remote branches.

Resolving Merge Conflicts in Databricks Repos

1. Manually Resolve Conflicts:

   • Use the code editor to edit the file and remove conflict markers.
   • Click "Mark as Resolved" after editing.

2. Automatic Resolutions:

   • Use dropdown options to keep all current or take all incoming changes.
   • Matches code changes with respective color for clarity.

Steps for Conflict Resolution

1. Identify the conflict.
2. Choose a resolution strategy (manual or automatic).
3. Edit the file if manual resolution is chosen.
4. Mark as resolved and continue with merge/rebase.
5. Complete the operation in Databricks Repos.

Conclusion

• Databricks Repos enhances collaboration and simplifies the developer experience.
• The new Git merge, rebase, and conflict resolution features streamline team collaboration.
• Emphasizes seamless integration of development workflows in Databricks.

Additional Resources

• Databricks Repos Documentation
• Atlassian Documentation on Merge vs Rebase

Questions & Discussion

• Open floor for questions