Automated Xonotic Git build system

Thread Rating:

2 Vote(s) - 5 Average
1
2
3
4
5

Automated Xonotic Git build system

Junior Member

#60

01-20-2011, 05:37 AM

Hello!

I tried build the game, but always get this ugly message:

Quote:error: Untracked working tree file 'env/calm_sea/calm_sea_bk.jpg' would be overwritten by merge. Aborting
Pulling failed. Press ENTER to continue, or Ctrl-C to abort.

What can I do now?
I don't really understand what is it meaning.

« Next Oldest

Next Newest »

Messages In This Thread

Automated Xonotic Git build system - by Mr. Bougo - 07-04-2010, 04:06 PM

RE: Automated Xonotic Git build system - by ArgeadGER - 07-05-2010, 08:48 AM

RE: Automated Xonotic Git build system - by noteven - 07-05-2010, 12:34 PM

RE: Automated Xonotic Git build system - by Mr. Bougo - 07-05-2010, 01:23 PM

RE: Automated Xonotic Git build system - by dfsp_spirit - 07-05-2010, 01:39 PM

RE: Automated Xonotic Git build system - by Mr. Bougo - 07-05-2010, 02:38 PM

RE: Automated Xonotic Git build system - by dfsp_spirit - 07-06-2010, 05:41 AM

RE: Automated Xonotic Git build system - by Agamalama - 07-05-2010, 06:11 PM

RE: Automated Xonotic Git build system - by Mr. Bougo - 07-06-2010, 06:11 AM

RE: Automated Xonotic Git build system - by noteven - 07-08-2010, 03:01 PM

RE: Automated Xonotic Git build system - by Mr. Bougo - 07-08-2010, 03:04 PM

RE: Automated Xonotic Git build system - by DiaboliK - 07-09-2010, 09:39 PM

RE: Automated Xonotic Git build system - by Mr. Bougo - 07-10-2010, 04:08 AM

RE: Automated Xonotic Git build system - by Slup - 07-12-2010, 04:33 AM

RE: Automated Xonotic Git build system - by jacob - 07-12-2010, 04:27 PM

RE: Automated Xonotic Git build system - by rainerzufalldererste - 07-21-2010, 11:27 AM

RE: Automated Xonotic Git build system - by rainerzufalldererste - 07-22-2010, 02:24 PM

RE: Automated Xonotic Git build system - by Mr. Bougo - 07-23-2010, 03:14 AM

RE: Automated Xonotic Git build system - by noteven - 07-27-2010, 08:07 AM

RE: Automated Xonotic Git build system - by Mr. Bougo - 08-03-2010, 03:34 AM

RE: Automated Xonotic Git build system - by noteven - 08-04-2010, 11:29 AM

RE: Automated Xonotic Git build system - by Mr. Bougo - 08-04-2010, 11:37 AM

RE: Automated Xonotic Git build system - by Cortez666 - 08-11-2010, 04:24 AM

RE: Automated Xonotic Git build system - by noteven - 08-11-2010, 06:27 AM

RE: Automated Xonotic Git build system - by Mr. Bougo - 08-11-2010, 11:11 AM

RE: Automated Xonotic Git build system - by noteven - 08-12-2010, 04:26 AM

RE: Automated Xonotic Git build system - by Mithos - 08-13-2010, 07:40 AM

RE: Automated Xonotic Git build system - by Mr. Bougo - 08-13-2010, 09:16 AM

RE: Automated Xonotic Git build system - by Mithos - 08-24-2010, 03:54 PM

RE: Automated Xonotic Git build system - by mezzodaemon - 08-25-2010, 12:30 AM

RE: Automated Xonotic Git build system - by Mr. Bougo - 08-25-2010, 12:53 AM

RE: Automated Xonotic Git build system - by Mr. Bougo - 08-25-2010, 01:11 AM

RE: Automated Xonotic Git build system - by Minkovsky - 08-31-2010, 12:46 PM

RE: Automated Xonotic Git build system - by Mr. Bougo - 08-31-2010, 02:01 PM

RE: Automated Xonotic Git build system - by aCROX999 - 09-27-2010, 10:24 PM

RE: Automated Xonotic Git build system - by Mr. Bougo - 09-28-2010, 06:11 AM

RE: Automated Xonotic Git build system - by nightmare433 - 10-04-2010, 05:39 AM

RE: Automated Xonotic Git build system - by Mr. Bougo - 10-04-2010, 10:11 AM

RE: Automated Xonotic Git build system - by Irritant - 10-06-2010, 12:37 PM

RE: Automated Xonotic Git build system - by Mr. Bougo - 10-07-2010, 11:27 AM

RE: Automated Xonotic Git build system - by aCROX999 - 10-09-2010, 01:10 AM

RE: Automated Xonotic Git build system - by Mr. Bougo - 10-09-2010, 02:21 AM

RE: Automated Xonotic Git build system - by Mr. Bougo - 10-09-2010, 11:43 AM

RE: Automated Xonotic Git build system - by aCROX999 - 10-10-2010, 01:59 AM

RE: Automated Xonotic Git build system - by unknownnf - 10-11-2010, 02:55 PM

RE: Automated Xonotic Git build system - by aCROX999 - 10-12-2010, 12:13 AM

RE: Automated Xonotic Git build system - by Friskydingo - 10-13-2010, 04:05 PM

RE: Automated Xonotic Git build system - by Mr. Bougo - 10-14-2010, 12:16 PM

RE: Automated Xonotic Git build system - by Mr. Bougo - 10-16-2010, 02:50 AM

RE: Automated Xonotic Git build system - by aCROX999 - 11-15-2010, 06:53 PM

RE: Automated Xonotic Git build system - by Mr. Bougo - 11-17-2010, 12:26 PM

RE: Automated Xonotic Git build system - by aCROX999 - 11-17-2010, 11:37 PM

RE: Automated Xonotic Git build system - by Mr. Bougo - 11-18-2010, 12:37 AM

RE: Automated Xonotic Git build system - by aCROX999 - 11-18-2010, 03:29 AM

RE: Automated Xonotic Git build system - by Cortez666 - 11-18-2010, 03:38 AM

RE: Automated Xonotic Git build system - by aCROX999 - 11-18-2010, 03:52 AM

RE: Automated Xonotic Git build system - by Expertsetup - 12-05-2010, 12:48 PM

RE: Automated Xonotic Git build system - by Creation - 12-16-2010, 02:33 AM

RE: Automated Xonotic Git build system - by Friskydingo - 12-16-2010, 07:24 PM

RE: Automated Xonotic Git build system - by xaN1C4n3 - 01-20-2011, 05:37 AM

RE: Automated Xonotic Git build system - by Mr. Bougo - 01-20-2011, 05:42 AM

RE: Automated Xonotic Git build system - by xaN1C4n3 - 01-23-2011, 11:27 AM

RE: Automated Xonotic Git build system - by Samual - 01-20-2011, 12:08 PM

RE: Automated Xonotic Git build system - by Mr. Bougo - 01-20-2011, 12:26 PM

RE: Automated Xonotic Git build system - by Mr. Bougo - 01-23-2011, 11:31 AM

RE: Automated Xonotic Git build system - by xaN1C4n3 - 01-23-2011, 11:37 AM

RE: Automated Xonotic Git build system - by Mr. Bougo - 01-23-2011, 11:40 AM

RE: Automated Xonotic Git build system - by xaN1C4n3 - 01-23-2011, 12:05 PM

RE: Automated Xonotic Git build system - by xaN1C4n3 - 01-27-2011, 12:50 PM

RE: Automated Xonotic Git build system - by Mr. Bougo - 01-27-2011, 12:55 PM

RE: Automated Xonotic Git build system - by xaN1C4n3 - 01-27-2011, 01:03 PM

RE: Automated Xonotic Git build system - by Mr. Bougo - 01-27-2011, 01:04 PM

RE: Automated Xonotic Git build system - by xaN1C4n3 - 01-27-2011, 01:05 PM

RE: Automated Xonotic Git build system - by Samual - 01-27-2011, 08:20 PM

Possibly Related Threads…
Thread		Author	Replies	Views	Last Post
	0.8.6 and git - Stutter points / Profiling / Code Optimization	dagelf	1	4,942	06-08-2024, 04:16 PM Last Post: dagelf
	[SOLVED] How to build data	AriosJentu	5	6,484	08-14-2019, 08:18 AM Last Post: Freddy
	WebAssembly Build	Addison	1	4,282	04-07-2019, 03:02 PM Last Post: martin-t
	Xonotic Git Help	Molnija	4	8,038	01-20-2019, 11:38 PM Last Post: Molnija
	A Garry's Mod / sandbox system	MirceaKitsune	20	47,750	01-05-2019, 10:52 PM Last Post: 3agle427
	Spawn system	Mirio	57	62,575	05-28-2016, 03:49 AM Last Post: Smilecythe
	[SOLVED] setting proper git pushurl	BuddyFriendGuy	0	3,540	04-07-2015, 09:44 PM Last Post: BuddyFriendGuy
	git branch archival	TimePath	2	7,625	02-08-2015, 03:01 PM Last Post: Mr. Bougo
	Cloning git?	end user	2	5,188	09-15-2014, 03:35 AM Last Post: end user
	Segmentation fault @ Xonotic(git)	Ari	2	6,074	01-31-2014, 02:45 AM Last Post: Ari

View a Printable Version

Users browsing this thread:

1 Guest(s)