Venture Posted October 16, 2013 Group: Members Topic Count: 52 Topics Per Day: 0.01 Content Count: 179 Reputation: 2 Joined: 08/30/13 Last Seen: November 7, 2024 Share Posted October 16, 2013 (edited) 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. 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 October 16, 2013 by gekigengar Quote Link to comment Share on other sites More sharing options...
Akinari Posted October 16, 2013 Group: Members Topic Count: 32 Topics Per Day: 0.01 Content Count: 247 Reputation: 207 Joined: 10/23/12 Last Seen: March 2, 2022 Share Posted October 16, 2013 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. Quote Link to comment Share on other sites More sharing options...
Venture Posted October 17, 2013 Group: Members Topic Count: 52 Topics Per Day: 0.01 Content Count: 179 Reputation: 2 Joined: 08/30/13 Last Seen: November 7, 2024 Author Share Posted October 17, 2013 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! Quote Link to comment Share on other sites More sharing options...
Question
Venture
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.
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 gekigengarLink to comment
Share on other sites
2 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.