Error map
CONFLICT Git: CONFLICT (content): Merge conflict in file — Automatic merge failed
Git · layer 7, Build & delivery
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.
Directly related (6)
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.
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.
error: Your local changes to the following files would be overwritten by merge
git pull/merge would modify files you’ve changed but not committed.
fatal: Not possible to fast-forward, aborting.
pull is configured to fast-forward only, but your branch and the remote have diverged.
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.
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).
Two steps away (12)
Git: Permission denied (publickey). fatal: Could not read from remote repository.
SSH authentication to GitHub/GitLab/Bitbucket failed — no key, wrong key, or the key isn’t added to your account.
fatal: not a git repository (or any of the parent directories): .git
You ran a Git command outside a Git working tree.
You are in 'detached HEAD' state.
HEAD points at a commit instead of a branch, so new commits won’t belong to any branch.
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.
error: cannot pull with rebase: You have unstaged changes. Please commit or stash them.
A rebase (or pull --rebase) needs a clean working tree.
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.
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.
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.
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.
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.
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.
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.
Map another error
Popular: 4035004000xC000007BTypeErrorCritical error404NullPointerException