Git "leaky" branches?

Question

We usually develop features for new branches, and then fixes on the main branch. This time, for some reason, one of the feature branches had a leak, where it was merged back into master when it shouldn't.

In the screenshot you will see that we have the sms_open and 121217 function branches. 121217 should have been combined with the master after our sprint, and then the sms_open branch had a longer time estimate, so it should be discarded for a future release. I can not understand why sms_open committed 609129d. I see an unwanted merge on 75e845b, but the developer who did this denies that sms_open is merging back. Is there any way to check this in any way?

FYI, the git tool used here is SourceTree for Mac OS.

Answer 1

When you trace the greenish line down starting from 121217 , you can see that it is connected to sms_open . This means that story 121217 based on sms_open (this is one of its parent commits).

So, whoever 121217 branch based on it sms_open instead of master (probably by mistake). This may be the author of commit e70759c .

When merging a branch in Git, all the commits from the branch for merging that are not yet part of the branch that are merged will be part of the result. This is why sms_open commits sms_open also been merged.

Answer 2

There is something suspicious in this screenshot. A message like "Merge branch xxx" is the default message when merging with master .

There is commit c8cb6, which implies that the blue line is the lead. But then there is 75e8, which means that the yellow line is a master. Unfortunately, other messages are anonymized and therefore do not help to understand what is happening. It is especially important which commit belongs to the developer. - It seems to me that someone worked on the master and later renamed this thread. (But I don’t have enough details to tell.)

If the story does not make sense, fast forward or forced pressing may be associated, especially ff-merge is average, as it simply is not recorded in the history.

If you have access to your official git repository, there may be links that can give you a hint who pushed what and when.