On Thursday, August 16, 2012 09:42:19 PM Greg Troxel wrote: > Vladimir Nadvornik <nadvor...@suse.cz> writes: > > But merge commits break > > this rule - they contains random changes together. So my feeling is > > that with merge commits the history would be harder to review and > > debug but I have no practical experiences... > > No, merge commits don't break that rule; they do something different, > which is to apply the combination of several commits in one logical > step, still preserving the ability to examine the original commits.
I meant merge commits that resolves some conflicts. In general, you can't choose what will go to this commit and you have to fix everything together. I think I have similar opinion like in this article: http://randyfay.com/node/91 Vladimir ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel
