How to handle merge conflicts in GitBook

Tutorials & tips

21 Nov, 2024

An icon depicting a merge conflict on a pale background

Author

Aiko Sakieva

Latest blog posts

10 Dec, 2025

Introducing the next era of docs with GitBook Agent

30 Nov, 2025

New this month: Faster performance, embeddable GitBook Assistant, enhanced navigation

31 Oct, 2025

New this month: New keyboard shortcuts, better search and a bunch of side panel improvements

Get the GitBook newsletter

Get the latest product news, useful resources and more in your inbox. 130k+ people read it every month.

10 Dec, 2025

Introducing the next era of docs with GitBook Agent

Samy Pessé

30 Nov, 2025

New this month: Faster performance, embeddable GitBook Assistant, enhanced navigation

Suzy Everist

31 Oct, 2025

New this month: New keyboard shortcuts, better search and a bunch of side panel improvements

Steve Ashby

View all blog posts

Build knowledge that never stands still

Join the thousands of teams using GitBook and create documentation that evolves alongside your product

Start for free

Talk to us

Build knowledge that never stands still

Join the thousands of teams using GitBook and create documentation that evolves alongside your product

Start for free

Talk to us

Build knowledge that never stands still

Join the thousands of teams using GitBook and create documentation that evolves alongside your product

Start for free

Talk to us

Documentation

GitBook product docs

GitBook developer docs

GitBook guides

Company

About

Careers

Contact and support

Privacy statement

Solutions

Published docs

API docs

Help centers

Internal knowledge base

Open Source

Enterprise

Switch to GitBook

Pricing

Key features

Git Sync

Editor

GitBook AI

GitBook Agent

GitBook Assistant

Authenticated access

Integrations

Resources

Customers

Blog

Videos

Events

Help center

Changelog

Status

Security and compliance

Newsletter

440 N Barranca Ave #7171, Covina, CA 91723, USA. EIN: 320502699

Documentation

GitBook product docs

GitBook developer docs

GitBook guides

Company

About

Careers

Contact and support

Privacy statement

Solutions

Published docs

API docs

Help centers

Internal knowledge base

Open Source

Enterprise

Switch to GitBook

Pricing

Key features

Git Sync

Editor

GitBook AI

GitBook Agent

GitBook Assistant

Authenticated access

Integrations

Resources

Customers

Blog

Videos

Events

Help center

Changelog

Status

Security and compliance

Newsletter

440 N Barranca Ave #7171, Covina, CA 91723, USA. EIN: 320502699

Documentation

Product

Enterprise

Resources

Pricing

Get a demo

Start for free

Get a demo

Start for free