Mail Archives: geda-user/2015/03/18/13:42:54
DJ Delorie wrote:
> > I think your life with Git at and outside work would be easier if
> > you decided to learn ... I'm happy to help if I can.
>
> I've been through the "let me teach you the git way" before. It
> doesn't stick because "the git way" is not the way I write code.
Hm, what do you mean by "the git way" ? I'm talking about learning
the data model which git uses internally to make that data model work
for you, not learning some particular workflow that someone else
thinks is great.
> I've used LOTS of CMS's over the decades, and git is the first one
> that just doesn't do what I want.
What do you want?
> > So don't create big commits. "Doctor, it hurts when I do this.."
>
> I can't help if if one fix takes time and lines of code. It's
> still one fix.
That's true, but sometimes it's better to fix things a different way.
Anyway, how does the tool matter for "slow" large changes? I guess
it's also about how you can resolve conflicts and not about how they
happen.
I think the git command doesn't enforce any particular conflict
resolution tool, so you can use what you would have used with
other VCSes, assuming that it's a standalone utility. (Maybe this
is the problem?)
Kind regards
//Peter
- Raw text -