Jump to content
  • 0

Git referencing


gekigengar

Question


  • Group:  Members
  • Topic Count:  49
  • Topics Per Day:  0.01
  • Content Count:  174
  • Reputation:   2
  • Joined:  08/30/13
  • Last Seen:  

I recently moved from SVN to GIT.

 

When I tried to update my server,

 

It tells me to stash the server, so I did.

 

When I stashed the server, all the red exclamation (!) telling me what I have changed from the original

rathena files dissapeared into green checks.

 

Stash2.png

 

Stash1.png

 

How do I refer the changes back from the "original rAthena" instead of my "Last Saved Stash"?.

 

It is very hard knowing what I have changed recently :(

 

Please, I need those red exclamation back..!

Edited by gekigengar
Link to comment
Share on other sites

2 answers to this question

Recommended Posts


  • Group:  Members
  • Topic Count:  32
  • Topics Per Day:  0.01
  • Content Count:  247
  • Reputation:   207
  • Joined:  10/23/12
  • Last Seen:  

The command to call back your changes in your code is

 

git stash pop

 

If there are any conflicts, it will place points in the code where the conflict was and you can then manually resolve them.

Link to comment
Share on other sites


  • Group:  Members
  • Topic Count:  49
  • Topics Per Day:  0.01
  • Content Count:  174
  • Reputation:   2
  • Joined:  08/30/13
  • Last Seen:  

The command to call back your changes in your code is

 

git stash pop

 

If there are any conflicts, it will place points in the code where the conflict was and you can then manually resolve them.

 

What I wanted is so that it refers back to the "Original File" to check for "red exclamation marks" (Changes).

Instead of refering back to the "Last saved stash" to check for changes. (Which is why its all green even with my changes.)

I want it to compare with the original rathena file instead of my last saved stash.

 

please help!

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...