Skip to content

Merge Branch into Current Branch dialog is broken or illogical #1660

@donlassini

Description

@donlassini

I have a repo, BranchTest, with 2 branches: main and Testbranch.
I have made changes in both branches.

I want to merge the changes from Testbranch into main.
But when I try do do that, I get a dialog that is either faulty or I don't know how to fill out.

  • GitLens Version: 11.6.0
  • Git Version: 2.33.0.windows.2
  • VSCode Version: 1.60.2 7f6ab5485bbc008386c4386d08766667e155244e x64
  • OS Version: Windows 10, 21H1, build 19043.1237

Steps to Reproduce:
I open the main branch; I verify that it's selected in the left part of the bottom status bar.
I go to GitLens > Branches > Testbranch.
GitLens shows that "Branch Testbranch is 2 commits behind".
I right click and select Merge Branch into Current Branch.

I get a dialog that says "Confirm merge into branch main"
There's an edit box with the text "Confirm Merge".
There's an option below the box that says
"Cancel Merge. Branch main is up to date with branch Testbranch".
There's also a button with a check mark that says "Will always confirm".

Dialog

Metadata

Metadata

Assignees

No one assigned

    Labels

    inactiveIssue has not had recent required feedbackneeds-more-infoNeeds further information, steps, details, etc.

    Type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions