Step by step guide to update your server?

[TeoTwawki]

So it seems that there is some conflicts. This is what I run into. If I choose TortoiseGit > Resolve to fix the conflicts I then receive the billion errors when recompiling again.

That doesn't do what you think it does, you wanted "TortoiseGit > Edit Conflicts" instead.

Just about everyone new to git I've ever met, has made that exact same mistake.

[enkidou]

the errors you got were 99% because you didn't resolve the conflicts (pretty much guarantee there was a <<<<<< on line 8166, which is a conflict diff marker)

Sure was!

That doesn't do what you think it does, you wanted "TortoiseGit > Edit Conflicts" instead.

Just about everyone new to git I've ever met, has made that exact same mistake.

Thanks! I'll give that a go.

[kjLotus]

you can probably google "resolving conflicts git" to get some stuff to help you, but tortoisegit's merge tool is pretty good anyways

[Desufire]

Just followed all of the instructions, filled in some blanks from google searches, and hopefully have it set up properly.

I still don't understand a lot about how Commits, Push, and Pulls work, but I apologize if some commits I had made when I first got started, got to you guys and annoyed ya. Think I understand enough now though.

EDIT/UPDATE:

Just did my first commit and push and I'm so happy I figured it out. Everything went smoothly enough that I keep expecting my pc to start smoking lol.

Quick question: When I do a Merge between my fork and upstream, that won't overwrite the files I've pushed to my fork, will it?

[demolish]

it'll merge the changes on your local branch, the you'll have to push to your fork