David Y.
—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?
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
Tasty treats for web developers brought to you by Sentry. Get tips and tricks from Wes Bos and Scott Tolinski.
SEE EPISODESConsidered “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.
Here’s a quick look at how Sentry handles your personal information (PII).
×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?We may disclose your PII to the following type of recipients:
You may have the following rights related to your PII:
If you have any questions or concerns about your privacy at Sentry, please email us at compliance@sentry.io.
If you are a California resident, see our Supplemental notice.