Skip to content

Edits toolbar goes on top of Open Merge Editor blue button #254884

Open
Open
Edits toolbar goes on top of Open Merge Editor blue button#254884
Assignees
jrieken
Labels
bugIssue identified by VS Code Team member as probable bugchatmerge-editor
Milestone
Backlog

Description

@joaomoreno
João Moreno (joaomoreno)
opened on Jul 9, 2025

Have Copilot do edits on a file which has merge conflicts.

Image

Activity

  1. João Moreno (joaomoreno)
    assigned
    Johannes Rieken (jrieken)
    and
    Henning Dieterichs (hediet)
    on Jul 9, 2025
  2. João Moreno (joaomoreno)
    added
    bugIssue identified by VS Code Team member as probable bug
    on Jul 9, 2025
  3. Henning Dieterichs (hediet)
    added
    merge-editor
    chat
    on Jul 15, 2025
  4. Henning Dieterichs (hediet)
    added this to the Backlog milestone on Jul 15, 2025

  5. hediet commented on Dec 16, 2025

    @hediet
    Henning Dieterichs (hediet)
    on Dec 16, 2025
    Member

    I believe Ladislau Szomoru (@lszomoru) fixed this.

  6. Henning Dieterichs (hediet)
    closed this as completedon Dec 16, 2025

  7. lszomoru commented on Jan 7, 2026

    @lszomoru
    Ladislau Szomoru (lszomoru)
    on Jan 7, 2026
    Member

    I did create a PR to fix this but it is blocked due to notebooks - #268005

  8. Ladislau Szomoru (lszomoru)
    reopened this on Jan 7, 2026
  9. Henning Dieterichs (hediet)
    removed their assignment
    on Jan 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Labels

bugIssue identified by VS Code Team member as probable bugchatmerge-editor

Type

No type

Projects

No projects

    Milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions