updating server using git

[kitty14]

Hello rathena! i did update my server last December and i works fine using git stash and git pull however i wanted to update my server today and i can't make any changes or continue i always get this message (check image below.) and i did check the txt file that has "need merges" theres no >>>>>>>>> ========= or <<<<<<<<< to edit. how can i fix this? please help.. thanks!

 

Edited January 13, 2015 by kitty14

[Cydh]

that's mean, ur file need to be staged

git add --force <file>

[anacondaq]

Hi, sorry for stupid question, but read the second part of these article http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

[kitty14]

Thanks

[Cydh]

welcome