At Databricks, we’re dedicated to simplifying the developer expertise and are thrilled to unveil further Git capabilities in Databricks Repos. Customers can now run Git merge and Git rebase and resolve merge conflicts immediately from the Repos UI.

New Operations: Merge & Rebase

Every operation is a solution to mix the commit historical past from one department into one other department; the one distinction is the technique it makes use of to realize this. For rookies, we suggest utilizing merge at first, as a result of it doesn’t require pressure pushing to a department and due to this fact doesn’t rewrite commit historical past. Rebase supplies a cleaner undertaking historical past, however rewrite that historical past, which may result in points. Databricks permits groups to decide on what works finest for them. To study extra concerning the variations between the methods, please see Atlassian’s documentation on the topic.

What Causes Merge Conflicts?

Merge & Rebase Operations

Throughout a merge or rebase, a merge battle is encountered when Git can’t robotically mix code from one department into one other. Generally two individuals have modified the identical line of code and due to this fact it’s not possible to robotically resolve which one ought to be saved. Merge conflicts require handbook decision earlier than a merge or rebase might be accomplished.

Pull Operation

A pull operation pulls commits from a distant department to an area one. A pull operation might be run even whereas a consumer may need uncommitted, excellent adjustments. Which means that if the uncommitted adjustments battle with the commits being pulled from distant, the end result will likely be a merge battle that wants resolving.

Find out how to Resolve Merge Conflicts

When you have a merge battle, the Repos UI supplies instruments to resolve them:

1. Manually Resolve Conflicts: Use the code editor to take away battle markers and edit the file as wanted, then click on the “Mark as Resolved” button.
   
2. Maintain All Present or Take Incoming Modifications: One other approach of resolving merge conflicts is to let Git edit the file for you. If the entire adjustments from one department or the opposite is desired, the dropdown choices can be utilized to Maintain all present adjustments or Take all incoming adjustments.
   • Tip: Confused about which possibility to choose? The colour of every possibility matches the respective code adjustments that it’ll maintain.

At any time, if the adjustments weren’t desired, the “Abort” button can be utilized to abort the method and undo every part. As soon as all conflicts are resolved, click on the “Proceed Merge” or “Proceed Rebase” choice to resolve the battle and full the operation.

For extra data, see Git operations in Databricks.

Conclusion

Databricks continues to innovate to offer highly effective and user-friendly instruments for knowledge scientists and engineers. The brand new Git merge, Git rebase and battle decision options in Repos make collaboration more practical and seamless, additional enhancing the developer expertise. Able to get began? Attempt operating a merge or rebase operation inside Databricks or dive deeper into the Databricks Repos documentation to study extra.