Re: Git conflicts

[Valentin Villenave]

2008/6/22 Rune Zedeler <address@hidden>:

> Will people having pulled from me up to a point before the merge (i.e.
> before the new dev/rune differs from the old dev/rune) be negatively
> affected by this, or will it only be a problem for the ones having pulled
> after the merge?

I'm not sure anyone other than me has "really" pulled from your
branch, so I guess this will be a very minor side-effect anyway :)

Cheers,
Valentin