Jump to content
  • 0
Sign in to follow this  
SlashGeeGee

Updating from Repo

Question

Hi Herc.


1st. ) I just relocated my repo in here "https:://github.com/HerculesWS/Hercules" because this repository is no longer available anymore "http://svn.github.com/HerculesWS/Hercules.git" and when I update my Hercules using TortoiseSVN. all the branches are checked out. then i tried to relocate again to here " https://github.com/HerculesWS/Hercules/commits/master " it say's it's not the root of the repository.
 

2nd. ) I'm using TortoiseSVN to checkout the emulator and for the updates. but the problem is I get this problem. http://herc.ws/board/topic/130-notepad-format/ . so my question is. 

 

So how do I get to update my Hercules using TortoiseSVN ? Is it okay for me to install TortoiseGit on my pc to resolve problem no 2.. since I have TortoiseSVN already will that be a conflict ?

 

 

 

Best Regards,

SlashGeeGee

Share this post


Link to post
Share on other sites

4 answers to this question

Recommended Posts

  • 0

I'm currently using TortoiseGIT and TortoiseSVN on the same computer right now and it doesn't seem to have any issues having them both on.

But you should be able to checkout Hercule using https://github.com/HerculesWS/Hercules for SVN since it's a link provided by GitHub when selecting a clone.

Edited by JoWei

Share this post


Link to post
Share on other sites
  • 0

I'm currently using TortoiseGIT and TortoiseSVN on the same computer right now and it doesn't seem to have any issues having them both on.

But you should be able to checkout Hercule using https://github.com/HerculesWS/Hercules for SVN since it's a link provided by GitHub when selecting a clone.

 

That is my repo as of the moment. but when i try to do SVN Update. all the branches are being added like bcrypt,rathena and others. How can i update the master branch only ? follow up . If i use TortoiseGit will it checkout only the master branch ? :D

 

 

SlashGeeGee

Share this post


Link to post
Share on other sites
  • 0

if there is conflicts

why not after pull(git) or update(svn) why not use resolved

and do manual resolving the conflicts.

Share this post


Link to post
Share on other sites
  • 0

if there is conflicts

why not after pull(git) or update(svn) why not use resolved

and do manual resolving the conflicts.

 

not that kind of conflict . I mean program conflict. but JoWei already said that there's no harm when installing tortoisesvn and tortoisegit in one pc.

Share this post


Link to post
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.   Restore formatting

  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.

Loading...
Sign in to follow this  

×
×
  • Create New...

Important Information

By using this site, you agree to our Terms of Use.