I created a branch from mainline, Now I made few changes in mainline and I want to copy same changes to mainline. Which merge option is safe to use? port fix or feature merge or advanced merge? Also I dont want to directly commit the changes to mainline.I just want the branch changes to be tranferred to mainline so that I can check and then commit.
Hi Vivek Hyalij ,
First you have to commit your changes in newly created branch line
then go to main line and select version control menu >Merge changes Here >Advanced Merge
then select your branch lines and start and end revision