Git - Revision history

Tony: /* Error messages */

2026-06-08T07:37:07Z

Error messages

← Older revision		Revision as of 07:37, 8 June 2026
Line 72:		Line 72:
	===error: You have not concluded your merge (MERGE_HEAD exists).===		===error: You have not concluded your merge (MERGE_HEAD exists).===

			===error: unknown switch `b'===
			Try '''--bare''' instead of '''-b'''

	===git checkout errors===		===git checkout errors===
Line 95:		Line 96:
	=== Updates were rejected because the remote contains work that you do not have locally.===		=== Updates were rejected because the remote contains work that you do not have locally.===
	??		??



	== error: Merging is not possible because you have unmerged files. ==		== error: Merging is not possible because you have unmerged files. ==

2026-04-11T09:10:06Z

FAQ

← Older revision		Revision as of 09:10, 11 April 2026
Line 64:		Line 64:

	==Error messages==		==Error messages==
			===warning: remote HEAD refers to nonexistent ref, unable to checkout===
			You probably need to
			git check master
			of
			git checkout main

	===error: You have not concluded your merge (MERGE_HEAD exists).===		===error: You have not concluded your merge (MERGE_HEAD exists).===

2026-01-25T12:33:26Z

FAQ

← Older revision		Revision as of 12:33, 25 January 2026
Line 58:		Line 58:
	==git pull==		==git pull==
	===You are not currently on a branch.===		===You are not currently on a branch.===

			==Restore single file==
			Move the file away and
			git restore yourfile

	==Error messages==		==Error messages==
Line 63:		Line 67:
	===error: You have not concluded your merge (MERGE_HEAD exists).===		===error: You have not concluded your merge (MERGE_HEAD exists).===

	~~==Restore single file==~~
	~~Move the file away and~~
	~~git restore yourfile~~


	==git checkout==		===git checkout errors===
	===error: pathspec 'master' did not match any file(s) known to git===		====error: pathspec 'master' did not match any file(s) known to git====
	then you get that from		then you get that from
	git checkout master		git checkout master
Line 77:		Line 78:


	==Automatic merge failed; fix conflicts and then commit the result.==		===Automatic merge failed; fix conflicts and then commit the result.===

	Try		Try
	git mergetool		git mergetool

	== error: src refspec master does not match any. ==		=== error: src refspec master does not match any. ===

	ye well, screw you. you did something wrong!		ye well, screw you. you did something wrong!

	~~ ~~
			=== Updates were rejected because the remote contains work that you do not have locally.===
			??



	== error: Merging is not possible because you have unmerged files. ==		== error: Merging is not possible because you have unmerged files. ==

2025-11-04T18:04:04Z

FAQ

← Older revision		Revision as of 18:04, 4 November 2025
Line 59:		Line 59:
	===You are not currently on a branch.===		===You are not currently on a branch.===

			==Error messages==

			===error: You have not concluded your merge (MERGE_HEAD exists).===

	==Restore single file==		==Restore single file==

2025-10-14T09:37:26Z

Remove file from repository but not from filesystem

← Older revision		Revision as of 09:37, 14 October 2025
Line 23:		Line 23:
	==Remove file from repository but not from filesystem==		==Remove file from repository but not from filesystem==
	git rm --cached filetokeep		git rm --cached filetokeep
			and add it to .gitignore

	==Create repository on server==		==Create repository on server==

2025-10-14T08:35:43Z

Cheat sheet

← Older revision		Revision as of 08:35, 14 October 2025
Line 18:		Line 18:

	=Cheat sheet=		=Cheat sheet=
			==Show changes in a file==
			git log --follow -p your.file

	==Remove file from repository but not from filesystem==		==Remove file from repository but not from filesystem==

2025-09-10T09:42:35Z

error: Merging is not possible because you have unmerged files.

← Older revision		Revision as of 09:42, 10 September 2025
Line 85:		Line 85:

	This is not a joke!		This is not a joke!

			For now check https://stackoverflow.com/questions/36086202/git-merge-is-not-possible-because-i-have-unmerged-files

	== fatal: cannot do a partial commit during a merge. ==		== fatal: cannot do a partial commit during a merge. ==

2025-08-06T09:49:41Z

Cheat sheet

← Older revision		Revision as of 09:49, 6 August 2025
Line 18:		Line 18:

	=Cheat sheet=		=Cheat sheet=

			==Remove file from repository but not from filesystem==
			git rm --cached filetokeep

	==Create repository on server==		==Create repository on server==

2025-07-10T12:51:03Z

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

← Older revision		Revision as of 12:51, 10 July 2025
Line 90:		Line 90:

	== error: Your local changes to the following files would be overwritten by merge:==		== error: Your local changes to the following files would be overwritten by merge:==
	~~move the file away and try again?~~		git stash
			git pull
			git stash pop


	== list untracked files ==		== list untracked files ==

2025-07-10T11:01:41Z

Git error messages

← Older revision		Revision as of 11:01, 10 July 2025
Line 125:		Line 125:

	===fatal: detected dubious ownership in repository ===		===fatal: detected dubious ownership in repository ===


			===Merge with strategy ort failed===
			ORT stands for “Ostensibly Recursive Three-way”