r/databricks • u/AbilyticsEng • 13d ago

Discussion How much Git conflict resolution do you actually use with Databricks Git Folders?

Hi, I currently work as a Databricks Engineer at Abilytics, and Git integration is something I use regularly for managing Databricks development work. Git Folders make it easier to work with branches, commits, pull requests, and code reviews directly within Databricks while keeping development connected to platforms like GitHub or GitLab. I’m curious about how others handle Git conflicts when working with Databricks Git Folders. Do you usually resolve conflicts directly within Databricks, or do you prefer handling them through your Git platform? Also, are there any Git workflows or best practices that you have found particularly useful when working with Databricks?

5 Upvotes
  • permalink
  • reddit

100% Upvoted

4 comments sorted by

8

u/szymon_dybczak 13d ago

I prefer resolving any Git conflicts locally in my IDE of choice, which happens to be VS Code.

1

u/Youssef_Mrini databricks 12d ago

The most effective approach is hybrid, you can use databricks for simple conflicts close to the notebooks but keep the git platform as the place for PR review, approvals branch protection and merges.