It can't affect the merge, but I could check for the data's existence, rm it, commit the deletion, and then scold the naughty developer... Yeah, not a bad idea actually. :) Cheers Jay. On 17/02/2011, at 5:52 PM, Jay Soffian wrote: > On Wed, Feb 16, 2011 at 11:44 PM, Liam Clarke > <liam.clarke-hutchinson@xxxxxxxxxxxxx> wrote: >> What about when I'm merging my own feature branches into master? Also, past performance indicates that yelling about bad stuff in merges works quite well when they're in the same office as you... > > BTW, why not just use the post-merge hook to amend the merge after the fact? > > j. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html