Docs

Product

Features

Resources

Pricing

We're hiring!

View all posts

View all posts

How to handle merge conflicts in GitBook

How to handle merge conflicts in GitBook

Tutorials & tips

Tutorials & tips

Tutorials & tips

21 Nov

Author

Author

Author

Aiko Sakieva

An icon depicting a merge conflict on a pale background

An icon depicting a merge conflict on a pale background

An icon depicting a merge conflict on a pale background

View all posts

View all posts

View all posts

Popular

GitBook docs

An icon of a computer screen, with a location pin on the screen, all on a pale background

An icon of a computer screen, with a location pin on the screen, all on a pale background

An icon of a computer screen, with a location pin on the screen, all on a pale background

Localize your docs with variants in GitBook

17 Jan

GitBook docs

An icon of a cloud with arrows pointing up to it and down from it, on a pale background

An icon of a cloud with arrows pointing up to it and down from it, on a pale background

An icon of a cloud with arrows pointing up to it and down from it, on a pale background

API docs: The seven principles of great API docs and how to apply them

09 Jan

Get the GitBook newsletter

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

Email

Similar posts

GitBook docs

An icon of a cloud with arrows pointing up to it and down from it, on a pale background

An icon of a cloud with arrows pointing up to it and down from it, on a pale background

An icon of a cloud with arrows pointing up to it and down from it, on a pale background

API docs: The seven principles of great API docs and how to apply them

09 Jan

Matthew Revell

Matthew Revell

GitBook docs

An icon showing a computer display with a play button on the screen, all on a pale background

An icon showing a computer display with a play button on the screen, all on a pale background

An icon showing a computer display with a play button on the screen, all on a pale background

Upload and embed a playable video into your GitBook docs

19 Dec

A photograph of Steve Ashby

Steve Ashby

GitBook docs

An icon showing a series of lines moving diagonally upwards on a pale background

An icon showing a series of lines moving diagonally upwards on a pale background

An icon showing a series of lines moving diagonally upwards on a pale background

Track documentation analytics with Google Analytics

12 Dec

John Cashman

Get started for free

Play around with GitBook and set up your docs for free. Add your team and pay when you’re ready.

Sign up with GitHub

Footer CTA

Sign up with GitHub

sign_up_github

Start for free

Footer CTA

Start for free

sign_up

Get started for free

Play around with GitBook and set up your docs for free. Add your team and pay when you’re ready.

Sign up with GitHub

Footer CTA

Sign up with GitHub

sign_up_github

Start for free

Footer CTA

Start for free

sign_up

Get started for free

Play around with GitBook and set up your docs for free. Add your team and pay when you’re ready.

Sign up with GitHub

Footer CTA

Sign up with GitHub

sign_up_github

Start for free

Footer CTA

Start for free

sign_up

Product

Public docs

API docs

Internal docs

Enterprise

Open source

Customer showcase

Product tour

Pricing

Features

Visitor authentication

Git Sync

GitBook AI

Integrations

Resources

GitBook product docs

Code

GitBook developer docs

Blog

Videos

Events

Changelog

Security and compliance

Newsletter

Company

About

Careers

Contact and support

Terms of service

Privacy policy

© 2025 Copyright GitBook INC. 440 N Barranca Ave #7171, Covina, CA 91723, USA. EIN: 320502699

Product

Public docs

API docs

Internal docs

Enterprise

Open source

Customer showcase

Product tour

Pricing

Features

Visitor authentication

Git Sync

GitBook AI

Integrations

Resources

GitBook product docs

Code

GitBook developer docs

Blog

Videos

Events

Changelog

Security and compliance

Newsletter

Company

About

Careers

Contact and support

Terms of service

Privacy policy

© 2025 Copyright GitBook INC. 440 N Barranca Ave #7171, Covina, CA 91723, USA. EIN: 320502699

Product

Public docs

API docs

Internal docs

Enterprise

Open source

Customer showcase

Product tour

Pricing

Features

Visitor authentication

Git Sync

GitBook AI

Integrations

Resources

GitBook product docs

Code

GitBook developer docs

Blog

Videos

Events

Changelog

Security and compliance

Newsletter

Company

About

Careers

Contact and support

Terms of service

Privacy policy

© 2025 Copyright GitBook INC. 440 N Barranca Ave #7171, Covina, CA 91723, USA. EIN: 320502699