Merge branches with unrelated histories in Git
David Y.
—The Problem
During a Git merge, I encounter the following error message:
fatal: refusing to merge unrelated histories Error redoing merge
How can I fix this error and complete the merge?
The Solution
Git is very flexible and allows us to do things that may not be intuitive for a source control program, such as creating branches in the same repository that have entirely different contents and commit histories. This has some practical uses, such as the gh-pages branch used to publish websites on GitHub Pages.
However, if we attempt to merge two branches without a common base commit, we will encounter this error, which was introduced in Git 2.9.0 to prevent accidental merges of this type, as they are quite unusual.
If this error occurs during a merge that is not intended to combine two separate codebases, there may be a problem with our local Git repository. Reclone the remote version of the repository in a different directory and migrate any local changes there before attempting the merge again.
If we are attempting to combine two separate codebases, we must pass the flag --allow-unrelated-histories to git merge:
git merge --allow-unrelated-histories
- Syntax.fmListen to the Syntax Podcast
- ResourcesWhat is Distributed Tracing
- Listen to the Syntax Podcast
![Syntax.fm logo]()
Tasty treats for web developers brought to you by Sentry. Get tips and tricks from Wes Bos and Scott Tolinski.
SEE EPISODES
Considered “not bad” by 4 million developers and more than 100,000 organizations worldwide, Sentry provides code-level observability to many of the world’s best-known companies like Disney, Peloton, Cloudflare, Eventbrite, Slack, Supercell, and Rockstar Games. Each month we process billions of exceptions from the most popular products on the internet.
A peek at your privacy
Here’s a quick look at how Sentry handles your personal information (PII).
×Who we collect PII from
We collect PII about people browsing our website, users of the Sentry service, prospective customers, and people who otherwise interact with us.
What if my PII is included in data sent to Sentry by a Sentry customer (e.g., someone using Sentry to monitor their app)? In this case you have to contact the Sentry customer (e.g., the maker of the app). We do not control the data that is sent to us through the Sentry service for the purposes of application monitoring.
Am I included?PII we may collect about you
- PII provided by you and related to your
- Account, profile, and login
- Requests and inquiries
- Purchases
- PII collected from your device and usage
- PII collected from third parties (e.g., social media)
How we use your PII
- To operate our site and service
- To protect and improve our site and service
- To provide customer care and support
- To communicate with you
- For other purposes (that we inform you of at collection)
Third parties who receive your PII
We may disclose your PII to the following type of recipients:
- Subsidiaries and other affiliates
- Service providers
- Partners (go-to-market, analytics)
- Third-party platforms (when you connect them to our service)
- Governmental authorities (where necessary)
- An actual or potential buyer
We use cookies (but not for advertising)
- We do not use advertising or targeting cookies
- We use necessary cookies to run and improve our site and service
- You can disable cookies but this can impact your use or access to certain parts of our site and service
Know your rights
You may have the following rights related to your PII:
- Access, correct, and update
- Object to or restrict processing
- Port over
- Opt-out of marketing
- Be forgotten by Sentry
- Withdraw your consent
- Complain about us
If you have any questions or concerns about your privacy at Sentry, please email us at [email protected].
If you are a California resident, see our Supplemental notice.