POV-Ray : Newsgroups : povray.off-topic : Git branches on local machine? : Re: Git branches on local machine? Server Time
28 Nov 2021 15:24:51 EST (-0500)
  Re: Git branches on local machine?  
From: Jim Henderson
Date: 31 Oct 2021 20:50:40
Message: <pan$86cf3$5e82356f$a88f364b$7121a2fc@nospam.com>
On Sun, 31 Oct 2021 19:29:01 -0400, Cousin Ricky wrote:

> Eventually, I figured out--or so I think--that I skipped a step in the
> sandbox, and that's why I couldn't get it to work.  (Like I said in the
> last thread, my head can't seem to retain Git commands and procedures
> past an hour or so.)  I applied that step, and things then looked as you
> described.  I presume that this shit will become intuitive at some
> point; how long did it take you all?

I had worked with Subversion and Perforce previously, so the only thing 
that was really different for me using git was the lack of file locking 
(which is by design).

I still learn things off and on when I go back to using it - not quite as 
frequently as I used to.  And when I was learning it, I had a really 
awesome development team that I was working with who helped me when I got 
into trouble.  The good news is that with git, as long as something's 
been committed, you can usually recover it even in the most dire of 
circumstances (as long as it's in a local and at least one remote repo).  
The bad news is that sometimes it can be *really* ugly figuring out how 
to fix things if multiple people are committing to the same repo and are 
not communicating effectively.

The single most important thing is to ensure that all files you're 
working on in the repo are tracked by git.  If they're not, when you 
switch branches, they'll still be there, and that can get really 
confusing, really fast.  (Unless it's something that you *meant* to not 
track, like a config file, for example).

"I learned long ago, never to wrestle with a pig. You get dirty, and 
besides, the pig likes it." - George Bernard Shaw

Post a reply to this message

Copyright 2003-2021 Persistence of Vision Raytracer Pty. Ltd.