help i have some questions

[kerbiii 5]

1. How to know my hercules revision

 

2. How to update using git but keeping the changes i made

 

3. how to merge the changes i made and the update in git pull?

[Mumbles 193]

If your server's live and running, type @version in-game to retrieve the GIT hash. Alternatively, you can check it from a command line, like this:

git rev-parse HEAD

 

If you want the short version of the hash, type this instead:

git rev-parse --short HEAD

 

---

 

Assuming you're still using the command line to operate git, you can merge new updates with this command:

git pull --commit

 

---

 

To stay updated with ease, simply just make changes for your server within the same working copy that you use for GIT. Concurrent changes are handled fairly well, so unless you've made mass updates, you should be fine. I recommend that you make backups if you're unsure of whether or not updating will conflict with your customisations.

[kerbiii 5]

If your server's live and running, type @version in-game to retrieve the GIT hash. Alternatively, you can check it from a command line, like this:

git rev-parse HEAD

 

If you want the short version of the hash, type this instead:

git rev-parse --short HEAD

 

---

 

Assuming you're still using the command line to operate git, you can merge new updates with this command:

git pull --commit

 

---

 

To stay updated with ease, simply just make changes for your server within the same working copy that you use for GIT. Concurrent changes are handled fairly well, so unless you've made mass updates, you should be fine. I recommend that you make backups if you're unsure of whether or not updating will conflict with your customisations.

thanks

 

meaning:

 

git pull --commit will update my rev at the sametime will keep all my changes?

[Mumbles 193]

thanks

 

meaning:

 

git pull --commit will update my rev at the sametime will keep all my changes?

 

As long as you don't have anything that conflicts with the update, you'll be fine in most cases. In the event that you do have conflicts, a manual update may be needed. Your own changes won't be discarded unless you confirm that's what you want to do.