Hi guys, i made a branch, i changed some stuff in this branche and after a while I did a merge to main line. Then I worked further in the branche and tried to update the main line but unfortunately this is not possible seen it has already merged... So I need to merge the latest version of the branche to the main line of an already merged branche, how can I do this?
You can use an Advanced merge to select which revisions you would like to merge to the main-line. Grayed-out lines will have already been merged, so just select the first non-grayed-out revision as your start revision and the last one as your end revision.