GIT

[Daddy]

Is there a tutorial with example files and such that I can edit to learn how to use Git?

I tried and got to the point where I made an edit to the master branch and experimental branch and tried to merge them and since the edits were different I got some weird error.

Maybe if I use a tutorial or something I can learn how it works. 

[guff]

hey it took me a couple days to figure out how to push my changes to github 

i haven't had to deal with merges yet

[Daddy]

Goddamn, it's still a bit confusing but using Vim makes it a lot easier than using smultron, though I don't know how much more difficult it would be to commit multiple changes


Just merging

Code Select

#Comment for testing Git
from the experimental branch with

Code Select

#Testing comments in Git
from the master branch was enough of a pain in the ass.



Imagine trying to consolidate differences in hundreds of files. 

[guff]

no one else here knows or cares about git 

[Daddy]

no one else here knows or cares about git 

They should.