Git questions

[Aeromesi]

So I have a few questions and a problem.

1st Problem: (FIXED) <- means ignore this

Now my question (pertaining to Git)

My hercules is modified a lot, and when updating with a git pull I come across a lot of errors that won't allow me to compile, is  there a quick or easy solution? This is what I've been doing since the beginning:

So what I do is this;

1) Click Merge, and select Commit and I input the next Commit hash that hasn't been added to my server

2) Hit Commit, then Proceed to Stash Save (sometimes I get successful sometimes I get errors)

 

3) Upon Stash Save being successful, I proceed to Merge the revision number back into the project.

Then it checks to see of stash pop was successful and it is (haven't had it not yet, only when doing a full upgrade with git pull from CMD)

Any help here? I talked to @@Dastgir about it but didn't get far into my own attempts q-q

 

[Tranquility]

Try a good old:

git stash save && git pull && git stash pop
If you wish to update your files, while keeping your own modifications.

Comitting is saving the status on your computer, until you're pushing it to your repository. So it's safe to do, so you can revert if needed.

 

[Aeromesi]

This is what I get which was my previous error... @@Tranquility

edited

Honestly if I could have a dev or anyone update my emulator and fix these conflict issues I'll gladly throw some $ >.> this is becoming troublesome for me.-

 

[Samuel]

you just need to commit first your work before git pull, then after pulling you'll have some conflicts but you'll have options on how to resolve them ☺

 

[Aeromesi]

And how would I go about that? @@Samuel. I really need help here, been attempting this for a while now (more like lots of days)

 

[Dastgir]

@@Samuel, that error means its conflict with the mod aeromesi have, and needs manual merge...

 

[Jedzkie]

@@Aeromesi, OMG your desktop.. O_O xD

 

[Aeromesi]

Off topic but I KNEW SOMEONE WOULD SAY SOMETHING LOL.

Yeah it needs a clean-up, so what?

I'll get to it... ONCE I FIGURE OUT MY GIT PROBLEMS QQ

@@Frost xD

 

[ossi0110]

Aeromesi add me on Skype i can show you how to solve it 

nightfire0110

 

[Tranquility]

This is what I get which was my previous error... @@Tranquility

Don't throw my IP around so casually xD
Did you solve it yet with ossi?

 

[Dastgir]

Actually that needs manual merging...

 

[Aeromesi]

sorry @@Tranquility i just noticed that.

 

[Samuel]

@@Aeromesi @@Dastgir

yeah it's manual merge,