sm-discuss AT lists.ibiblio.org
Subject: Public SourceMage Discussion List
List archive
- From: Jeremy Blosser <jblosser-smgl AT firinn.org>
- To: sm-discuss AT lists.ibiblio.org
- Subject: Re: [SM-Discuss] git feedback
- Date: Fri, 28 Jul 2006 16:32:43 -0500
On Jul 28, Arwed von Merkatz [v.merkatz AT gmx.net] wrote:
> > It shows up more often on the history files because of the specific way in
> > which RCS' /usr/bin/merge makes bad assumptions, but yes, it shows up
> > elsewhere as well. The fix for this would be general in nature.
>
> Merging in perforce was far from perfect too, but it was fitting our
> work model a little bit better. There definitely is the possibility to
> make the merging work better for us due to git just using external
> tools, but all I did in that area was a proof-of-concept so far.
Can you provide the code you had for that if you still have it?
Attachment:
pgpDkbGOmScue.pgp
Description: PGP signature
-
Re: [SM-Discuss] git feedback
, (continued)
- Re: [SM-Discuss] git feedback, Andraž "ruskie" Levstik, 07/28/2006
-
Re: [SM-Discuss] git feedback,
Ladislav Hagara, 07/28/2006
-
Re: [SM-Discuss] git feedback,
Jeremy Blosser, 07/28/2006
- Re: [SM-Discuss] git feedback, Andraž "ruskie" Levstik, 07/28/2006
- Re: [SM-Discuss] git feedback, Andrew Stitt, 07/28/2006
-
Re: [SM-Discuss] git feedback,
Arwed von Merkatz, 07/28/2006
- Re: [SM-Discuss] git feedback, Arwed von Merkatz, 07/28/2006
- Re: [SM-Discuss] git feedback, Ladislav Hagara, 07/31/2006
- Re: [SM-Discuss] git feedback, Arwed von Merkatz, 07/31/2006
- Re: [SM-Discuss] git feedback, Ladislav Hagara, 07/31/2006
-
Re: [SM-Discuss] git feedback,
Jeremy Blosser, 07/28/2006
- Re: [SM-Discuss] git feedback, Jeremy Blosser, 07/28/2006
- Re: [SM-Discuss] git feedback, Arwed von Merkatz, 07/28/2006
- Re: [SM-Discuss] git feedback, seth, 07/28/2006
- Re: [SM-Discuss] git feedback, Arwed von Merkatz, 07/28/2006
- Re: [SM-Discuss] git feedback, Jeremy Blosser, 07/28/2006
- Re: [SM-Discuss] git feedback, Jeremy Blosser, 07/28/2006
Archive powered by MHonArc 2.6.24.