Version control and merge

sankhya59
sankhya59
Hi, I have a situation like this I based my updates on a older version revision of the trunk now others have already updated the changes trunk now I want to merge my changes with deleting affecting others updates is this possible?

Last updated

DougR
DougR
It's always possible. If you're running a recent version of SVN then a merge should work well. If/when there are conflicts (changes made by others in the same line(s) that you made) then you will need to be smart about the resolution - possibly consulting with the original author of the prior changes.

1-2 of 2

Reply to this discussion

You cannot edit posts or make replies: You should be logged in before you can post.

Post a reply
464 views