Hi Rene,
On Thu, 22 May 2008 22:43:04 +0200 Rene Herman <rene.herman@keyaccess.nl> w=
rote:
es
I send email about them and most go away after a day or so i.e. something
changes to make the conflicts go away. However, the saving grace here is
"git rerere" which remembers these conflicts and their resolutions for me
so I normally only have to fix them once.
OK, good.
--=20
Cheers,
Stephen Rothwell sfr@canb.auug.org.auhttp://www.canb.auug.org.au/~sfr/