Jump to content
  • 0

Problem whith git pull


Valcars

Question


  • Group:  Members
  • Topic Count:  24
  • Topics Per Day:  0.01
  • Content Count:  60
  • Reputation:   0
  • Joined:  01/03/16
  • Last Seen:  

Hi I hope I have posted in the right section .... as the title suggests there were about fifteen days that I did not update the server .... it never gave me problems but now when I use git pull it gives me this error which is attached to the image ...... can someone tell me what caused the error and how I can fix it without deleting the changes ....

Senza titolo.png

Link to comment
Share on other sites

4 answers to this question

Recommended Posts

  • 0

  • Group:  Members
  • Topic Count:  25
  • Topics Per Day:  0.01
  • Content Count:  924
  • Reputation:   166
  • Joined:  04/05/13
  • Last Seen:  

You need to commit your changes first because there are conflicted files with latest rAthena updates.

Did you forked from rAthena yet or just using their reposity?

Link to comment
Share on other sites

  • 0

  • Group:  Members
  • Topic Count:  24
  • Topics Per Day:  0.01
  • Content Count:  60
  • Reputation:   0
  • Joined:  01/03/16
  • Last Seen:  

hello I copied rAthena from its repository ...... could you explain to me how to do so as not to have problems in the future .... sorry but unfortunately I'm not very familiar with git ....: \

Link to comment
Share on other sites

  • 0

  • Group:  Members
  • Topic Count:  25
  • Topics Per Day:  0.01
  • Content Count:  924
  • Reputation:   166
  • Joined:  04/05/13
  • Last Seen:  

1.Hit fork on rAthena GitHub sites.

2.You can see your own rAthena on https://github.com/Valcars1992?tab=repositories

3.Then use it instead of official rAthena reposity.

For you changes you can take it out by FTP (FileZilla) or otherway that can take whole folders out. (In case you don't want to lose your changes) then copy paste to your reposity again.

Link to comment
Share on other sites

  • 0

  • Group:  Members
  • Topic Count:  24
  • Topics Per Day:  0.01
  • Content Count:  60
  • Reputation:   0
  • Joined:  01/03/16
  • Last Seen:  

ah ok thanks I'll try as soon as I get back from work .... thanks for the explanation this afternoon I'll try and let you know ..... thanks again

Link to comment
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Answer this question...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

×
×
  • Create New...