On 24.08.2011 19:56, Mark Phippard wrote: > On Wed, Aug 24, 2011 at 1:50 PM, Stefan Sperling <s...@elego.de > <mailto:s...@elego.de>> wrote: > > > I don't like this because it only addresses the merge-meister use > case. > Developers perform merges, too. > The developer who does not want to commit local changes that > existed prior > to the merge now has to be careful to put files back on hold after the > merge command has removed files from the special changelist. > > > > We could probably go round and round on this forever if we want to, right?
Maybe it's time to just drop it and concentrate on 1.7.0? This thread has become way too long to follow, and some of the things I read are such blathering nonsense that it doesn't bear mentioning. I suggest everyone just steps away from this and lets it cool down for a month or two, /then/ come up with a proper feature proposal. -- Brane
