Login

Code:
$ ./all update

+ cd /home/karbofos/games/xonotic/.

+ git config remote.origin.fetch refs/heads/*:refs/remotes/origin/*

+ git pull

Updating 0a079af..2c4a7b5

error: Untracked working tree file 'data/common-spog.pk3' would be overwritten by merge.  Aborting

me too

Yeah it's a "chicken and egg" problem with the autocrlf stuff that was committed.

I fixed it by going into .git/config in the working directory and commenting out the offending autocrlf line and then doing a pull.

Then uncommenting the line again.

Possibly Related Threads…
Thread		Author	Replies	Views	Last Post
	[NEED HELP] Input layout problem in Xonotic-SDL	FinBiteLeaf	4	781	03-19-2024, 05:24 AM Last Post: FinBiteLeaf
	[NEED HELP] Windows 10 -basedir problem	BlazedRasta	4	5,199	03-21-2023, 07:34 PM Last Post: AlexVelasquez
	[BUG] A font-rendering performance problem (of upstream DarkPlaces)	NaitLee	11	3,976	08-20-2022, 01:23 AM Last Post: NaitLee
	[NEED HELP] Problem with charset of names in XonStat API	NAPALM	0	1,100	11-11-2021, 08:38 AM Last Post: NAPALM
	[NEED HELP] cant start the game/ session lock problem	skyghost47	1	3,828	10-24-2020, 11:50 PM Last Post: BuddyFriendGuy
	[BUG] some textures won't load with git builds	lister	2	2,773	01-17-2020, 06:09 PM Last Post: LuckyStripe
	Chat key bind problem	BuddyFriendGuy	4	3,387	01-26-2019, 11:12 PM Last Post: BuddyFriendGuy
	[SOLVED] Cannot run game anymore after new git update	Bloodthorn	2	3,178	07-25-2018, 07:20 AM Last Post: Bloodthorn
	[SOLVED] cannot compile git code	dingus	5	5,844	07-27-2016, 05:13 PM Last Post: sev
	[NEEDS INFO] Dedicated server problem.	kreestenrx1234	2	3,462	04-27-2016, 03:30 PM Last Post: BuddyFriendGuy