andymarks Posted May 18, 2012 Report Share Posted May 18, 2012 Hi, We have a child branch off our main branch, the developer has finished working on it and rather than merging the branch back into main he has merged the final chageset on the child branch into main. I use conditional format in the branch exporer to show unmerged branches (so I can see when my developers have finished their tasks) and this is giving me a false positive highlighting the branch as pending integration even though the last changeset has been merged (see below screenshot): Is there any way to fix this easily? Regards, Andy. Link to comment Share on other sites More sharing options...
manu Posted May 18, 2012 Report Share Posted May 18, 2012 Hello Andy, I'm sorry but can you confirm me that the parent branch of "..xxBugFixes" is also integrated? I can't see it, maybe it's directly the main branch, just to confirm it. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.