Mail Archives: geda-user/2015/03/18/13:10:48
DJ Delorie wrote:
> > Well, of course, that's a matter of trying to do manually what git
> > does automatically. The commit messages are your changelog in git.
>
> Designing a workflow around what your CMS requires is an example of
> the tail wagging the dog.
What if you think of it as a new breed of dog wagging its tail in a
new way, that lots of dogs like, and start mimicing?
I get it - you don't want to change how you work - but you need to
take responsibility for this being *your* issue, you can't blame it
on a tool. :)
> my example was one of "the project I work on has a workflow
> incompatible with git's desires" - *any* case where a project has a
> file that's commonly changed, and thus commonly conflicted, it
> going to suffer from git's workflow.
If a file is commonly conflicted there will be conflicts regardless
of what tools are used.
I understand prefering file locking over having to do post-mortem
conflict resolution, but personally I would rather avoid the conflict
from ever happening by communicating within the team. I realize that
this doesn't always work however, and I understand if some prefer a
tool to do it for them.
Kind regards
//Peter
- Raw text -