Ind 945 Posted February 6, 2013 (edited) Obtaining Hercules Hercules is available through GitHub, a web-based hosting service for software development projects that use the Git revision control system. Obtaining Hercules through Git on Windows Obtaining Hercules through Git on Linux Git Troubleshooting Support Looking for assistance on getting Git to work? Post hereAlternatively... GitHub also provides a SVN Mirror. We won't officially work to support many branches or repository-features in SVN, but it should remain in-sync with the latest stable release, based on master branch in git. Windows You need to download TortoiseGit The address is http://github.com/HerculesWS/Hercules Linux Typing the following creates a working copy of hercules at your home directory svn checkout http://github.com/HerculesWS/Hercules ~/Hercules Edited June 13, 2018 by AnnieRuru svn link changed, update broken forum syntax 8 kyeme, EriNa_KillerSoul, Senos and 5 others reacted to this Quote Share this post Link to post Share on other sites
Ind 945 Posted February 7, 2013 (edited) Obtaining Hercules through Git on Windows Downloads Download and Install MSysGit Download the latest TortoiseGit Installation Alright, first go through MSysGit installer and just set it up (its used as a base for TortoiseGit). then once you install MSysGit, launch the installer you just downloaded for TortoiseGit, you'll be prompted by a window similar to the following The next window is "Choose SSH Client", select "TortoisePLink", hit Next. The next window is "Custom Setup", do not change anything unless you know what you're doing, hit Next. We're done with the installation, that was easy, wasn't it? Obtaining Hercules Go to the folder where you want Hercules to be placed, right click and select "Git Clone..." in the URL field, type the following: https://github.com/HerculesWS/Hercules.git ensure the 'Directory' field is as desired, and hit 'OK' Now Hercules is being downloaded Just wait for it to complete the download of your working copy and you'll be good to go.Updating Hercules Right-Click the folder where you downloaded your working copy and within the TortoiseGit menu, select "Pull..." as shown below On the following window just hit 'OK', and your working copy will update. Edited June 13, 2018 by AnnieRuru update broken forum syntax 10 Neneka, Senos, AnnieRuru and 7 others reacted to this Quote Share this post Link to post Share on other sites
Ind 945 Posted February 7, 2013 (edited) Obtaining Hercules through Git on Linux CentOS Step 1: rpm -Uvh http://repo.webtatic.com/yum/centos/5/latest.rpm Step 2: yum install --enablerepo=webtatic git-all Step 3: yum install --enablerepo=webtatic --disableexcludes=main git-all Debian/Others Step 1: apt-get install git Obtaining a Working-Copy Type the following to create a Hercules working copy in your home (~) directory git clone https://github.com/HerculesWS/Hercules.git ~/Hercules Updating a Working-Copy Type the following when inside your working copy git pull Edited June 13, 2018 by AnnieRuru Needed a space after -Uvh, update broken forum syntax 6 JulioCF, Senos, AnnieRuru and 3 others reacted to this Quote Share this post Link to post Share on other sites
Ind 945 Posted February 24, 2013 Git Troubleshooting Please, commit your changes or stash them before you can merge.Aborting.Git doesn't update modified files even if they don't conflict unless they're properly "committed" in your local working copy, to do so is simple and advantageous (it will keep a log of your changes for yourself; so you can always go back and check what was changed and when)- On Unixgit commit -am "your log message, anything at all" - On Windows1. Right click your folder -> Git Commit -> "master"2. (optional) type the log message3. Hit 'OK' 7 Nidhogg, Legend, JulioCF and 4 others reacted to this Quote Share this post Link to post Share on other sites
Nash 2 Posted June 15, 2013 Bro Git aint working in my pc isnt there any SVN? 1 oapedhep reacted to this Quote Share this post Link to post Share on other sites
malufett 247 Posted June 15, 2013 Bro Git aint working in my pc isnt there any SVN? you can also use tortoisesvn just like before if you prefer the usual way.. Quote Share this post Link to post Share on other sites
Nash 2 Posted June 15, 2013 Well m new at hercules So dunno 1 NiklPar reacted to this Quote Share this post Link to post Share on other sites
mrlongshen 22 Posted June 26, 2013 (edited) why there are rathena and zones folder here ? with 1 should i use ? Edited June 26, 2013 by mrlongshen 1 CharlesKa reacted to this Quote Share this post Link to post Share on other sites
jaBote 438 Posted June 26, 2013 For most purposes, if not all, you should use the master branch the other branches are meant for development purposes except the rAthena branch, that is what we use for merging commits by its staff (if ever needed) Quote Share this post Link to post Share on other sites
Legato 0 Posted July 3, 2013 Hello. It's my first time here at Hercules and I have a problem, Git isn't working. I always get this error. Anyway, I've downloaded it using TortoiseSVN. But, I can't open Hercules-9, Hercules-10 or Hercules-12. I have MS Visual Studio C++ 2010 and 2008 installed in my computer. Quote Share this post Link to post Share on other sites
quesoph 105 Posted July 3, 2013 (edited) Hello. It's my first time here at Hercules and I have a problem, Git isn't working. I always get this error. Anyway, I've downloaded it using TortoiseSVN. But, I can't open Hercules-9, Hercules-10 or Hercules-12. I have MS Visual Studio C++ 2010 and 2008 installed in my computer. Just download msysGit. click Open msysGit WebSite. and to open Hercules-10 Right Click and Open With > MSC++2010 Edited July 3, 2013 by quesoph Quote Share this post Link to post Share on other sites
jaBote 438 Posted July 3, 2013 As it's said in the guide above, you also need to install msysGit before installing TortoiseGit. Here's a link to the binary you're missing to install for TortoiseGIT to work properly: http://code.google.com/p/msysgit/downloads/detail?name=Git-1.8.1.2-preview20130201.exe&can=2&q= Quote Share this post Link to post Share on other sites
Legato 0 Posted July 4, 2013 Hi. Thank you. It's working now. Quote Share this post Link to post Share on other sites
xienne15 5 Posted July 6, 2013 when updating this one appears git.exe pull -v --progress "origin"From https://github.com/HerculesWS/Hercules= [up to date] master -> origin/master= [up to date] rathena -> origin/rathena= [up to date] zones -> origin/zonesUpdating 88da261..8a127e1error: Your local changes to the following files would be overwritten by merge:src/map/battle.cPlease, commit your changes or stash them before you can merge.Abortinggit did not exit cleanly (exit code 1) (8594 ms @ 7/6/2013 12:32:43 PM) Quote Share this post Link to post Share on other sites
jaBote 438 Posted July 6, 2013 @xienne15, please see post #4 on this topic. Your issue is solved in the Git Troubleshooting section of this guide by Ind. Quote Share this post Link to post Share on other sites
Angelmelody 221 Posted July 11, 2013 (edited) I dun know why the svn address not working with windows TortoiseSVN client,but it was working fine with linux svn checkouterro msg: Checkout from http://svn.github.com/HerculesWS/Hercules.git, revision HEAD, Fully recursive, Externals includedThe PROPFIND response did not include the requested properties Edited July 13, 2013 by Angelmelody 1 NiklPar reacted to this Quote Share this post Link to post Share on other sites
Lelouch 10 Posted July 11, 2013 (edited) I dun know why the svn address not working with windows TortoiseSVN client,but it was working fine with linux svtcheckout erro msg: Checkout from http://svn.github.com/HerculesWS/Hercules.git, revision HEAD, Fully recursive, Externals includedThe PROPFIND response did not include the requested properties Dont use TortoiseSVN just use the Git follow #2 But if your using Linux its better to use svn checkout instead of using git, because its easier to merge your svn with the current changes even you have custom modifications in it rather using git. Edited July 11, 2013 by Lelouch 1 CharlesKa reacted to this Quote Share this post Link to post Share on other sites
Angelmelody 221 Posted July 11, 2013 I dun know why the svn address not working with windows TortoiseSVN client,but it was working fine with linux svtcheckout erro msg: Checkout from http://svn.github.com/HerculesWS/Hercules.git, revision HEAD, Fully recursive, Externals includedThe PROPFIND response did not include the requested properties Dont use TortoiseSVN just use the Git follow #2 But if your using Linux its better to use svn checkout instead of using git, because its easier to merge your svn with the current changes even you have custom modifications in it rather using git. I found the issues caused by updating TortoiseSVN to rev 1.8 ,When I use older rev TortoiseSVN client ,everything work fine Quote Share this post Link to post Share on other sites
evilpuncker 503 Posted July 11, 2013 I dun know why the svn address not working with windows TortoiseSVN client,but it was working fine with linux svtcheckout erro msg: Checkout from http://svn.github.com/HerculesWS/Hercules.git, revision HEAD, Fully recursive, Externals includedThe PROPFIND response did not include the requested properties I used to have the same problem but just changed the url to https://github.com/HerculesWS/Hercules.git and it worked fine with tortoise svn 1 Angelmelody reacted to this Quote Share this post Link to post Share on other sites
OnNplay 27 Posted July 14, 2013 I dun know why the svn address not working with windows TortoiseSVN client,but it was working fine with linux svtcheckout erro msg: Checkout from http://svn.github.com/HerculesWS/Hercules.git, revision HEAD, Fully recursive, Externals includedThe PROPFIND response did not include the requested properties I used to have the same problem but just changed the url to https://github.com/HerculesWS/Hercules.git and it worked fine with tortoise svn Yes https will correct the issue. Quote Share this post Link to post Share on other sites
evilpuncker 503 Posted July 14, 2013 I dun know why the svn address not working with windows TortoiseSVN client,but it was working fine with linux svtcheckout erro msg: Checkout from http://svn.github.com/HerculesWS/Hercules.git, revision HEAD, Fully recursive, Externals includedThe PROPFIND response did not include the requested properties I used to have the same problem but just changed the url to https://github.com/HerculesWS/Hercules.git and it worked fine with tortoise svn Yes https will correct the issue. I mean removing the svn. part of the link 1 NiklPar reacted to this Quote Share this post Link to post Share on other sites
OnNplay 27 Posted July 15, 2013 http://svn.github.com/HerculesWS/Hercules.git <---at revision 12212 https://github.com/HerculesWS/Hercules.git/ <--- at revision 12063 Are these two svn repositories equal to each other? Quote Share this post Link to post Share on other sites
jaBote 438 Posted July 15, 2013 Subversion numbers are a bit arbitrary on Git repositories, I don't exactly know why. I myself don't know if they're the last revision numbers, but you could do a comparison with some comparation programs such as WinMerge (supposing you're using Windows) or the diff command (supposing you're on Linux) and see if both folders contain the same files with the same content (maybe except the .svn folder). Should be the same, though, but this intrigates me. Quote Share this post Link to post Share on other sites
Valiente 7 Posted July 24, 2013 Hello. It's my first time here at Hercules and I have a problem, Git isn't working. I always get this error. Anyway, I've downloaded it using TortoiseSVN. But, I can't open Hercules-9, Hercules-10 or Hercules-12. I have MS Visual Studio C++ 2010 and 2008 installed in my computer. Just download msysGit. click Open msysGit WebSite. and to open Hercules-10 Right Click and Open With > MSC++2010 Hey man, I followed your instructions and downloaded MSysGit, but I am still getting this error. I downloaded and installed: msysGit-fullinstall-1.8.3-preview20130601.exe, I then downloaded and install Tortoisegit from the link that you provided. Hopefully you can help me out with this. Quote Share this post Link to post Share on other sites
Legato 0 Posted July 24, 2013 Download the Mysgit from the link Jabote's provided from his reply and that should solve your problem. Quote Share this post Link to post Share on other sites