we cut the branch with trunk. Changes are performed on both trees and are committed. Now we want to merge the branch in the trunk with all revision histories from both. Is it possible?
Is manual merging different from tortoise SVN merging, say I need to do 3-4 files? "So I manually check for changes, and then do it on the trunk and fix the trunk."
I used to ask a question, but still confused. Only experts comment.
thank
source
share