Boyah Forums

General => Internet, Science, & Technology => Topic started by: Daddy on March 02, 2009, 04:49:52 PM

Title: GIT
Post by: Daddy on March 02, 2009, 04:49:52 PM
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.  akudood;
Title: Re: GIT
Post by: guff on March 03, 2009, 06:10:04 AM
hey it took me a couple days to figure out how to push my changes to github  akudood;

i haven't had to deal with merges yet
Title: Re: GIT
Post by: Daddy on March 03, 2009, 06:26:57 AM
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. goonish



Imagine trying to consolidate differences in hundreds of files.  akudood;
Title: Re: GIT
Post by: guff on March 03, 2009, 06:34:44 AM
no one else here knows or cares about git  akudood;
Title: Re: GIT
Post by: Daddy on March 03, 2009, 07:11:41 AM
Quote from: guff on March 03, 2009, 06:34:44 AM
no one else here knows or cares about git  akudood;
They should.  akudood;