zielu / GitToolBox

GitToolBox IntelliJ plugin
GNU General Public License v3.0
604 stars 73 forks source link

[BUG] Merge Target not shown | Behind Tracker #394

Closed adam1010 closed 2 years ago

adam1010 commented 2 years ago

Describe the bug When a branch is behind the merge target (master in our case), that information is not displayed. Is it necessary for me to tell gittoolbox what branch is the merge target so that it knows to show that information?

To Reproduce

Storm view

image

Github view

image

Storm settings

image

Expected behavior Expecting to see Behind Tracker showing the branch is 22 commits behind

Plugin version 212.8.8

IDE version PhpStorm 2021.3.2

zielu commented 2 years ago

Hi, it's parent branch mode which is described here:

Whether is works on not depends on config and usage. In general git has no notion of PR - it does not track into which branch another one is supposed to be merged.

If someone using IDE Task management I can extract that info and as alternative if can be configured.

I might add a feature that assumes parent branch is the one from which current one was created but it's tricky.

adam1010 commented 2 years ago

That worked great, thank you! Feel free to close this Issue -- we very much appreciate your hard work on this plugin!

image