Error map

changes overwritten error: Your local changes to the following files would be overwritten by merge

Git · layer 7, Build & delivery

Open the full error page →

Centre: this error. First ring: errors it is linked with (6). Outer ring: what those are linked with. Colours show the layer of a request each error belongs to. Click any dot to re-centre the map on it; hover to follow its connections. The centre dot opens the error page.

7 · Build & delivery
changes overwritten — error: Your local changes to the following files would be overwritten by merge (Git)changes ove…untracked files overwritten — error: The following untracked working tree files would be overwritten by checkout/merge (Git)untracked files ove…CONFLICT — Git: CONFLICT (content): Merge conflict in file — Automatic merge failed (Git)CONFLICTnot possible to fast-forward — fatal: Not possible to fast-forward, aborting. (Git)not possible to fas…cannot rebase — error: cannot pull with rebase: You have unstaged changes. Please commit or stash them. (Git)cannot rebaseunfinished merge — fatal: You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you merge. (Git)unfinished mergeoverwritten by checkout — error: Your local changes to the following files would be overwritten by checkout (Git)overwritten by chec…Authentication failed — fatal: Authentication failed for 'https://github.com/x/y.git/' (Git)Authentication fail…cannot lock ref — error: cannot lock ref 'refs/remotes/origin/x': is at … but expected … / unable to update local ref (Git)cannot lock refunknown revision HEAD — fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree. (Git)unknown revision HE…non-fast-forward — Git: ! [rejected] … (fetch first) — error: failed to push some refs (Git)non-fast-forwardunrelated histories — Git: fatal: refusing to merge unrelated histories (Git)unrelated historiesrebase in progress — fatal: It seems that there is already a rebase-merge directory, and I wonder if you are in the middle of another rebase. (Git)rebase in progressdivergent branches — hint: You have divergent branches and need to specify how to reconcile them. (Git)divergent branchesbranch exists — fatal: a branch named 'x' already exists (Git)branch existssubmodule url — fatal: No url found for submodule path 'x' in .gitmodules (Git)submodule urlLFS smudge error — Error downloading object: x: Smudge error / This repository is over its data quota (Git)LFS smudge errormerge commit revert — error: commit x is a merge but no -m option was given. (Git)merge commit revertindex.lock exists — fatal: Unable to create '.git/index.lock': File exists. Another git process seems to be running in this repository (Git)index.lock existscorrupt object — error: object file .git/objects/x is empty / fatal: loose object is corrupt (Git)corrupt objectgc warning — warning: There are too many unreachable loose objects; run 'git prune' to remove them. (Git)gc warningdetached HEAD — You are in 'detached HEAD' state. (Git)detached HEADcouldn't find remote ref — fatal: couldn't find remote ref main (Git)couldn't find remot…no upstream branch — fatal: The current branch x has no upstream branch. (Git)no upstream branch

Directly related (6)

untracked files overwrittenGit

error: The following untracked working tree files would be overwritten by checkout/merge

Untracked local files have the same paths as files coming from the other branch.

CONFLICTGit

Git: CONFLICT (content): Merge conflict in file — Automatic merge failed

Both branches changed the same lines; Git needs you to choose the final content before completing the merge/rebase.

not possible to fast-forwardGit

fatal: Not possible to fast-forward, aborting.

pull is configured to fast-forward only, but your branch and the remote have diverged.

cannot rebaseGit

error: cannot pull with rebase: You have unstaged changes. Please commit or stash them.

A rebase (or pull --rebase) needs a clean working tree.

unfinished mergeGit

fatal: You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you merge.

A merge is still in progress — conflicts were resolved (or not) but not committed.

overwritten by checkoutGit

error: Your local changes to the following files would be overwritten by checkout

Switching branches would discard uncommitted changes in files that differ between branches.

Two steps away (17)

Authentication failedGit

fatal: Authentication failed for 'https://github.com/x/y.git/'

HTTPS authentication to the Git host failed — wrong or expired credentials, or a password used where a token is required.

cannot lock refGit

error: cannot lock ref 'refs/remotes/origin/x': is at … but expected … / unable to update local ref

Git couldn’t update a reference — stale remote-tracking refs, case-only branch name clashes, or a leftover lock file.

unknown revision HEADGit

fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.

The repository has no commits yet (or the ref doesn’t exist), so HEAD can’t be resolved.

non-fast-forwardGit

Git: ! [rejected] … (fetch first) — error: failed to push some refs

The remote branch has commits you don’t have locally, so Git refuses to overwrite them. Pull (merge or rebase) first, then push.

unrelated historiesGit

Git: fatal: refusing to merge unrelated histories

The two branches have no common ancestor — typically a local repo and a remote that were both initialized separately.

rebase in progressGit

fatal: It seems that there is already a rebase-merge directory, and I wonder if you are in the middle of another rebase.

A previous rebase is still in progress (or was interrupted).

divergent branchesGit

hint: You have divergent branches and need to specify how to reconcile them.

Git 2.27+ asks you to choose merge, rebase or fast-forward-only when local and remote both have new commits.

branch existsGit

fatal: a branch named 'x' already exists

You tried to create a branch whose name is already taken locally.

submodule urlGit

fatal: No url found for submodule path 'x' in .gitmodules

A submodule entry exists in the index but its URL is missing from .gitmodules.

LFS smudge errorGit

Error downloading object: x: Smudge error / This repository is over its data quota

Git LFS couldn’t download a large file — missing LFS install, auth problems, or the LFS bandwidth/storage quota is exhausted.

merge commit revertGit

error: commit x is a merge but no -m option was given.

git revert or cherry-pick on a merge commit needs to know which parent is the mainline.

index.lock existsGit

fatal: Unable to create '.git/index.lock': File exists. Another git process seems to be running in this repository

A lock file from another (or crashed) Git process blocks this command.

corrupt objectGit

error: object file .git/objects/x is empty / fatal: loose object is corrupt

The local Git object database is corrupted — usually after a crash, disk full or sync tool interference.

gc warningGit

warning: There are too many unreachable loose objects; run 'git prune' to remove them.

Git’s automatic garbage collection found many unreachable objects and is asking you to prune.

detached HEADGit

You are in 'detached HEAD' state.

HEAD points at a commit instead of a branch, so new commits won’t belong to any branch.

couldn't find remote refGit

fatal: couldn't find remote ref main

The branch you tried to pull/fetch doesn’t exist on the remote.

no upstream branchGit

fatal: The current branch x has no upstream branch.

The local branch isn’t linked to a remote branch yet, so a bare git push doesn’t know where to go.

Map another error

Popular: 403500400TypeErrorCritical error0xC000007BNullPointerException404