How to keep emulator updated

[Disgaea 0]

I've seen some topics about this but I just dont understand, I have a clone of the repository, but how I put my current emulator files into the clone to keep it updated? im using git desktop/sourcetree

[Habilis 119]

you need to perform a Fetch / Pull (Not to mix with Pull request) and resolve conflicts.

Then have a look inside this directory

https://github.com/HerculesWS/Hercules/tree/master/sql-files/upgrades

 

and see if there is anything new. If there is, run those SQL files in your RO database.

That's it, That's all there is to it...

 

 

Edited June 16, 2017 by Habilis

[Habilis 119]

Stick the chat to the forum ok? I don't like Helping in private messages. 

for 2 reasons

- In PM no one sees my Awesomeness!

- If I say BullShit, there is no one to correct me, as opposed to the forum, where people may see it and say "Habilis is bullshitting again".

 

To update your local repo with sourcetree you need to use Pull button.

I never worked with this gui, but I think, if there are no conflicts, there will be a silent update.

And if there are conflicts, it will ask you to resolve them before updating

 

then you can see what commit hash is your local branch and compare it to the latest commit hash on herc github

https://github.com/HerculesWS/Hercules/commits/master

 

If it checks then you are using latest version...

Edited June 16, 2017 by Habilis

[Disgaea 0]

11 minutes ago, Habilis said:

Stick the chat to the forum ok? I don't like Helping in private messages. 

for 2 reasons

- In PM no one sees my Awesomeness!

- If I say BullShit, there is no one to correct me, as opposed to the forum, where people may see it and say "Habilis is bullshitting again".

 

To update your local repo with sourcetree you need to use Pull button.

I never worked with this gui, but I think, if there are no conflicts, there will be a silent update.

And if there are conflicts, it will ask you to resolve them before updating

 

then you can see what commit hash is your local branch and compare it to the latest commit hash on herc github

https://github.com/HerculesWS/Hercules/commits/master

 

If it checks then you are using latest version...

No matter what it just dont work :/ , you can do it step by step with screenshot? If necessary I pay , I really need to learn how to do this <-<

[Habilis 119]

I don't offer any paid services (That's how you know it's me. If I suddenly request money, it's an imposter report him!)

My parents give me enough money for lunch at my school and for chewing gum. I don't need your money

 

 

 

2

3

 

Edited June 16, 2017 by Habilis

[Disgaea 0]

3 minutes ago, Habilis said:

I don't offer any paid services (That's how you know it's me. If I suddenly request money, it's an imposter report him!)

 

 

 

2

 

With that 2 videos I can learn how to keep the emulator updated?

[Habilis 119]

To keep your emulator updated you need to learn how GIT works (in general) and how SourceTree works (In particular)

 

Or wait till someone who needs money pops in and Explains it to you...

Edited June 16, 2017 by Habilis

[Disgaea 0]

2 minutes ago, Habilis said:

To keep your emulator updated you need to learn how GIT works (in general) and how SourceTree works (In particular)

 

Or wait till someone who needs money pops in and Explains it to you...

I'll see the video, thx for the help man

[REKT 10]

1 hour ago, Habilis said:

I don't offer any paid services (That's how you know it's me. If I suddenly request money, it's an imposter report him!)

My parents give me enough money for lunch at my school and for chewing gum. I don't need your money

 

 

 

2

3

 

 

The best comment ever!

I hate when people asking for FEE even if a simple guide or requests.

[Disgaea 0]

48 minutes ago, Vlync said:

The best comment ever!

I hate when people asking for FEE even if a simple guide or requests.

lol? 

Edited June 16, 2017 by Disgaea

[Legend 43]

Updating your git

1. Right click your Hercules folder (having green check on the folder) and choose Git Sync
Image:

 

 

2. A window will pop up, then click Pull
Image:

 

 

3. The one on the red box indicates that git is already receiving objects
Image:

 

 

4. Message on the window indicates that you successfully updated your File.
Image:

 

Edited June 17, 2017 by Legend

[Disgaea 0]

29 minutes ago, Legend said:

Updating your git

1. Right click your Hercules folder (having green check on the folder) and choose Git Sync
Image:

  Reveal hidden contents

 

2. A window will pop up, then click Pull
Image:

  Reveal hidden contents

 

3. The one on the red box indicates that git is already receiving objects
Image:

  Reveal hidden contents

 

4. Message on the window indicates that you successfully updated your File.
Image:

  Reveal hidden contents

Wow thx! what program are you using? tortoise?

[Legend 43]

3 hours ago, Disgaea said:

Wow thx! what program are you using? tortoise?

Yep 

[Disgaea 0]

8 hours ago, Legend said:

Yep 

And when I want to merge other branch I need to choose the branch and then pull? I dont need to click stash or stash pop?

[Mikegyver 9]

On 17/06/2017 at 1:37 AM, Disgaea said:

No matter what it just dont work :/ , you can do it step by step with screenshot? If necessary I pay , I really need to learn how to do this <-<

try to follow this guide.. it such a step by step. and it already in github, since this emulator using github.. it much easier

https://help.github.com/articles/configuring-a-remote-for-a-fork/

https://help.github.com/articles/syncing-a-fork/#platform-linux

https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request

but, i pretty sure during early attempt, u got stuck.. anyway, good luck.!