Stefan Fuhrmann wrote on Sat, Oct 30, 2010 at 18:27:40 +0200: > On 28.10.2010 17:06, Julian Foad wrote: >> Apologies in advance for the merge conflict this will cause when merging >> your change to trunk. > No worries. > > BTW, is there any policy on documenting merge conflict > so that people can have a second look at it if they care? >
Just say in the log message where/what the conflicts were and what approach you took to resolve them, I suppose. In the past, when merging to cherry-pick branches (/branches/1.6.x-rN), we have precedent for doing the merge, committing the merged result *with* conflict markers, and then resolving in a separate revision. Though, if you do this on trunk, you'll just break the build, so it's not as good an option in this case.
