RE: Commit to trunk and branch in a single commit
From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Tue, 26 Apr 2011 09:34:30 -0400
> Often I have small changes that apply to a branch and the trunk
If you do commit the same change manually to trunk and branch and then you try to do a merge you will get a conflict. You can do a --record-only merge after the fact to resolve that problem though. Or just deal with the conflict when you do finally merge.
This is an archived mail posted to the Subversion Users mailing list.