Skip to main content

- - Databricks for Industries
    Communications
    Media and Entertainment
    Financial Services
    Public Sector
    Healthcare & Life Sciences
    Retail
    Manufacturing
    See All Industries
  - Cross Industry Solutions
    Cybersecurity
    Marketing
  - Migration & Deployment
    Data Migration
    Professional Services
  - Solution Accelerators
    Explore Accelerators
    Move faster toward outcomes that matter
- - Company
    Who We Are
    Our Team
    Databricks Ventures
    Contact Us
  - Careers
    Working at Databricks
    Open Jobs
  - Press
    Awards and Recognition
    Newsroom
  - Security and Trust
    Security and Trust
Data + AI Summit Happening Now
Watch the free livestream of the keynotes!
Join now

Ready to get started?
Get a Demo

Data and AI summit

Data + AI Summit Happening Now

Watch the free livestream of the keynotes!

Login
Try Databricks

Blog
Grant Eaton

Grant Eaton

Grant Eaton's posts

Platform blog

Solutions

September 25, 2023/3 min read

New Support for Conflict Resolution in Repos: Merge, Rebase and Pull

Why Databricks

Discover

For Executives
For Startups
Lakehouse Architecture
Mosaic Research

Customers

Customer Stories

Partners

Cloud Providers
Technology Partners
Data Partners
Built on Databricks
Consulting & System Integrators
C&SI Partner Program
Partner Solutions

Discover

For Executives
For Startups
Lakehouse Architecture
Mosaic Research

Customers

Customer Stories

Partners

Cloud Providers
Technology Partners
Data Partners
Built on Databricks
Consulting & System Integrators
C&SI Partner Program
Partner Solutions

Product

Databricks Platform

Platform Overview
Sharing
Governance
Artificial Intelligence
Business Intelligence
Database
Data Management
Data Warehousing
Data Engineering
Data Science
Application Development

Pricing

Pricing Overview
Pricing Calculator

Integrations and Data

Marketplace
IDE Integrations
Partner Connect

Databricks Platform

Platform Overview
Sharing
Governance
Artificial Intelligence
Business Intelligence
Database
Data Management
Data Warehousing
Data Engineering
Data Science
Application Development

Pricing

Pricing Overview
Pricing Calculator

Integrations and Data

Marketplace
IDE Integrations
Partner Connect

Solutions

Databricks For Industries

Communications
Financial Services
Healthcare and Life Sciences
Manufacturing
Media and Entertainment
Public Sector
Retail
View All

Cross Industry Solutions

Cybersecurity
Marketing

Professional Services

Solution Accelerators

Databricks For Industries

Communications
Financial Services
Healthcare and Life Sciences
Manufacturing
Media and Entertainment
Public Sector
Retail
View All

Cross Industry Solutions

Cybersecurity
Marketing

Resources

Customer Support

Learning

Training
Certification
Free Edition
University Alliance
Databricks Academy Login

Events

Data + AI Summit
Data + AI World Tour
Data Intelligence Days
Event Calendar

Blog and Podcasts

Databricks Blog
Databricks Mosaic Research Blog
Data Brew Podcast
Champions of Data & AI Podcast

Learning

Training
Certification
Free Edition
University Alliance
Databricks Academy Login

Events

Data + AI Summit
Data + AI World Tour
Data Intelligence Days
Event Calendar

Blog and Podcasts

Databricks Blog
Databricks Mosaic Research Blog
Data Brew Podcast
Champions of Data & AI Podcast

About

Company

Who We Are
Our Team
Databricks Ventures
Contact Us

Careers

Open Jobs
Working at Databricks

Press

Awards and Recognition
Newsroom

Security and Trust

Company

Who We Are
Our Team
Databricks Ventures
Contact Us

Careers

Open Jobs
Working at Databricks

Press

Awards and Recognition
Newsroom

Databricks Inc.
160 Spear Street, 15th Floor
San Francisco, CA 94105
1-866-330-0121

See Careers
at Databricks

© Databricks 2025. All rights reserved. Apache, Apache Spark, Spark, the Spark Logo, Apache Iceberg, Iceberg, and the Apache Iceberg logo are trademarks of the Apache Software Foundation.

Privacy Notice
Terms of Use
Modern Slavery Statement
California Privacy
Your Privacy Choices