On Tue, Feb 21, 2012 at 04:48:12PM -0800, Rick Ramstetter wrote:
> Hi all,
>
> A question regarding the handling of multiple conflicts while
> postponing conflict resolution across multiple merged commits.
>
> Let's say I merge two commits from trunk to a branch:
> $
Hi all,
A question regarding the handling of multiple conflicts while
postponing conflict resolution across multiple merged commits.
Let's say I merge two commits from trunk to a branch:
$ cd /pathto/branch
$ svn merge svn://repo/trunk -c 1,2 --accept=postpone
Each of those merged commit
