Shindu Posted January 14, 2014 Group: Members Topic Count: 12 Topics Per Day: 0.00 Content Count: 28 Reputation: 0 Joined: 12/09/13 Last Seen: May 2, 2014 Share Posted January 14, 2014 Hey guys i get this when i use command "git pull" Updating a3dbbe2..d569d28error: Your local changes to 'npc/cities/prontera.txt' would be overwritten by merge. Aborting.Please, commit your changes or stash them before you can merge. How do you update without it doing this? Quote Link to comment Share on other sites More sharing options...
Shindu Posted January 15, 2014 Group: Members Topic Count: 12 Topics Per Day: 0.00 Content Count: 28 Reputation: 0 Joined: 12/09/13 Last Seen: May 2, 2014 Author Share Posted January 15, 2014 Okay i figured it all out. I get this. npc/mapflag/nobranch.txt: needs mergenpc/other/mail.txt: needs mergenpc/mapflag/nobranch.txt: needs mergenpc/other/mail.txt: needs mergenpc/mapflag/nobranch.txt: unmerged (c4f30f67698d458d58affaf6bc580ffd72d5e55f)npc/mapflag/nobranch.txt: unmerged (ad2cc37a209733749ed7f7394cbb42529206a881)npc/mapflag/nobranch.txt: unmerged (612eb9e6b791f2be5bda1e0326634aab9b55e756)npc/other/mail.txt: unmerged (2d3805780ce850d1aad3aeca49106adf8e4c427a)npc/other/mail.txt: unmerged (0da502d70a3448ee7dfd73950f1d1c58d58453ef)npc/other/mail.txt: unmerged (1c777ef41ec1af5979cdd8abe12f2aef2ec668e8) Anyone help me on how to fix this? ive opened the files and removed the <<<<<<< ======= >>>>>>> but still keeps failing to merge. NVM fixed Quote Link to comment Share on other sites More sharing options...
Shio Devs Posted January 15, 2014 Group: Members Topic Count: 14 Topics Per Day: 0.00 Content Count: 135 Reputation: 20 Joined: 02/05/13 Last Seen: August 24, 2014 Share Posted January 15, 2014 Do it manually haha, or make a back up of your current script and copy over after the installation. Quote Link to comment Share on other sites More sharing options...
Shindu Posted January 15, 2014 Group: Members Topic Count: 12 Topics Per Day: 0.00 Content Count: 28 Reputation: 0 Joined: 12/09/13 Last Seen: May 2, 2014 Author Share Posted January 15, 2014 update svn was so much better!!! Quote Link to comment Share on other sites More sharing options...
Shio Devs Posted January 15, 2014 Group: Members Topic Count: 14 Topics Per Day: 0.00 Content Count: 135 Reputation: 20 Joined: 02/05/13 Last Seen: August 24, 2014 Share Posted January 15, 2014 Was i'm sure there may be a way with GIT, But I've hardly used it myself, Quote Link to comment Share on other sites More sharing options...
Shindu Posted January 15, 2014 Group: Members Topic Count: 12 Topics Per Day: 0.00 Content Count: 28 Reputation: 0 Joined: 12/09/13 Last Seen: May 2, 2014 Author Share Posted January 15, 2014 Can anyone help on how to do this? Quote Link to comment Share on other sites More sharing options...
DeadlySilence Posted January 15, 2014 Group: Members Topic Count: 7 Topics Per Day: 0.00 Content Count: 181 Reputation: 53 Joined: 04/07/13 Last Seen: August 23, 2014 Share Posted January 15, 2014 update svn was so much better!!! lol'd at this. Can anyone help on how to do this? Maybe you should read some Git tutorials before trying to use it. It is not really hard but Git has a lot of features. To resolve your current problem I'd suggest to use git stash, git pull, git stash apply. This will lead to conflicts between your stashed changes and the ones you pulled. You have to resolve them manually because there's some logic Git couldn't resolve by itself. Quote Link to comment Share on other sites More sharing options...
kitty14 Posted August 7, 2014 Group: Members Topic Count: 103 Topics Per Day: 0.03 Content Count: 323 Reputation: 4 Joined: 12/09/13 Last Seen: May 9, 2023 Share Posted August 7, 2014 uhmm after you removed the <<<<<<< ======= >>>>>>>whats the next command? Quote Link to comment Share on other sites More sharing options...
Question
Shindu
Hey guys i get this when i use command "git pull"
Updating a3dbbe2..d569d28
error: Your local changes to 'npc/cities/prontera.txt' would be overwritten by merge. Aborting.
Please, commit your changes or stash them before you can merge.
How do you update without it doing this?
Link to comment
Share on other sites
7 answers to this question
Recommended Posts
Join the conversation
You can post now and register later. If you have an account, sign in now to post with your account.