Jump to content
  • 0
Aeromesi

Git questions

Question

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

12185321_547734982050852_5705236626620033611_o.jpg

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

11700870_547735432050807_708681976281932216_o.jpg
 

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

12188151_547735505384133_1962498350371633346_o.jpg
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

Share this post


Link to post
Share on other sites

12 answers to this question

Recommended Posts

  • 0

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.

Share this post


Link to post
Share on other sites
  • 0

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.-

Share this post


Link to post
Share on other sites
  • 0

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 ☺

Share this post


Link to post
Share on other sites
  • 0

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)

Share this post


Link to post
Share on other sites
  • 0

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

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...

×
×
  • Create New...

Important Information

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