Mail Archives: geda-user/2015/03/18/12:53:48
DJ Delorie wrote:
> > Our of curiousity, what have you got against it? Have you tried it?
> > Its an order of magnitude better than cvs/svn.
>
> I have to use git at work, as well as managing the geda git repo. It
> seems that no matter what "simple" operation I do, it fights me at
> every step.
My experience is that technical difficulties with Git usually relate
to an incomplete mental model of how Git operates, perhaps compounded
with expectations about how it surely must fit into already learned
workflows.
I think your life with Git at and outside work would be easier if you
decided to learn the (very small) Git data model, because it allows
thinking about git commands not in terms of "repeatable sequences"
but in terms of what operations they actually perform on the few
types of data that Git deals with. I'm happy to help if I can.
> I've had cases where my local repo got so confused that it was
> easier to delete the repo and start again than to try to figure
> out what happened to my patch.
Sure thing, the git command exposes lots of low-level operations
which can cause all sorts of problems, much like sudo rm -rf /
can cause all sorts of problems in a UNIX-like system.
> pretty much every big patch I've made has ended up with a ChangeLog conflict,
So don't create big commits. "Doctor, it hurts when I do this.."
> and conflict management is git's weak point.
I'd say it's about the same as all other popular VCSes, they all seem
to operate on source code line level.
> FYI the BIG reason why cvs is better for gedasymbols is it's the only
> one that lets you check out and manage a subdirectory of the repo.
Certainly! With Git, anything that should be available and/or managed
individually should rather have a repository of its own.
Kind regards
//Peter
- Raw text -