Create an account


Thread Rating:
  • 0 Vote(s) - 0 Average
  • 1
  • 2
  • 3
  • 4
  • 5
[SOLVED] Git updating problem

#1
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
I use google translator to write the message, so do not blame me in my illiterate speech
Reply

#2
me too
Reply

#3
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.
Reply



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

Forum Jump:


Users browsing this thread:
1 Guest(s)

Forum software by © MyBB original theme © iAndrew 2016, remixed by -z-