search

fork-dev / TrackerWin

Bug and issue tracker for Fork for Windows
450 stars 10 forks source link

Fork does not show merges after fetching #2196

Closed NickPlusSomeSimbols closed 2 months ago

NickPlusSomeSimbols commented 2 months ago

Снимок экрана 2024-04-10 101654

For some reason fork does not show branches being merged although merge commits are shown

DanPristupov commented 2 months ago

Do you see 2 parents in the commit details for merge commits?

Screenshot 2024-04-10 at 8 22 25
DanPristupov commented 2 months ago

Did someone merged PR with 'squash' option, may be? This way it would be correct behavior, I think.

NickPlusSomeSimbols commented 2 months ago

You're are right, first time PRs were merged with squash so I didn't even check, sorry and thank you

NickPlusSomeSimbols commented 2 months ago

One more question, won't it be useful then to mark merged with squash branches (that did not got yet other commits) with the similar sign that is applied to branches when the tracking reference is gone, so when you create PR, you don't look for every name of branches you sent among Merge commits?

DanPristupov commented 2 months ago

won't it be useful then to mark merged with squash branches (that did not got yet other commits) with the similar sign that is applied to branches when the tracking reference is gone

  1. Yes, if you delete the tracking reference after merge, the local branch will have a different icon. It doesn't matter if you used squash or not. So, just ensure that 'Remove branch' option in enabled when you merge PR.
  2. Such branches are not considered as merged. Yes, after merge the main branch has a commit with exactly same changes as in the target branch, but this doesn't make the target branch merged. 'Merged in X' means 'belongs to the X subgraph', but in this particular case it doesn't belong.