Merge branch into option missing

damies13 commented 4 months ago

i found that after upgrading from 0.38.3 to 0.44.3 the merge branch option has gone missing, so I can't figure out how to merge a bugfix branch into the release branch, something that was previously easy and intuitive is now hidden or missing completely. can we get this option back?

GitFiend commented 4 months ago

This is a regression, and I've started looking into it. I think it happens when information about the differences between branches fails to load. I've seen this before, but I don't know of a way to reproduce it. If you know of an open source repo I can look at the shows the problem, that would help a lot.

damies13 commented 4 months ago

These screenshots are from: https://github.com/damies13/rfswarm

I've since used Gitfiend v0.38.3 to merge do the merge from the screen shot and others to finish my bug fix release.

Feel free to fork my project if it helps you reproduce the bug :+1:

Dave.

GitFiend commented 4 months ago

Thanks for that. Annoyingly, it looks like the bug goes away with a clean checkout.

damies13 commented 4 months ago

Not sure if this will help, the way I run my branching is like this: Master - always the current release vx.x.x - release branch for next feature or bug fix release, only merged into master when all issues closed and all tests passing (i.e. release day) issue-#nnn-* - code changes related to an issue in the issue register, when all CI tests pass on this branch at can be merged into the release branch

As there is more than 1 person working on a release when something is merged into a release branch, the release branch is usually merged into the other open issue branch (so conflicts can be resolved before merging the issue into the release branch)

Also when a bug fix release is created it gets merged into any other open release branches (usually just the next feature release) and likewise the release branch that just got the merge from the bug fix release also gets merged into any open issue branch

Perhaps it's after several cycles of this that causes the issue to show up?
I've never flattened branches, so the project has all the branches going back for the whole project, so perhaps the forking process flattens the branches? I do know the forking process removes all the tags (I tag the master branch with the release number after I merge into master)

Not sure if any of that's helpful? hopefully it will give you a clue to solve the puzzle :crossed_fingers:

Dave.

GitFiend commented 4 months ago

Thanks, I think I have a fix. I've uploaded a pre release here if you wanted to help confirm it's fixed: https://github.com/GitFiend/Support/releases/tag/v0.45.3

damies13 commented 4 months ago

After I did the merge I needed with 0.38.3 then that option came back on 0.44.3 for the next merge I needed to do, unfortunately I have a family member in hospital, so have no time to check it the next few days, but as 0.44.3 I'm using is the flatpak version, so I'll get the update when it's available.

Thanks for working on this so quickly :+1:

GitFiend / Support

Merge branch into option missing #205