Skip to content

check out PR merges into current working branch #594

Closed
Closed
check out PR merges into current working branch#594
Assignees
rebornix
Labels
bugIssue identified by VS Code Team member as probable bugimportantIssue identified as high-priorityupstream/vscode
Milestone
October 2018

Description

@jeremygaither
Jeremy Gaither (jeremygaither)
opened on Oct 19, 2018
  • Extension version: 0.2.1
  • VSCode Version: 1.28.2
  • OS: macOS High Sierra

Steps to Reproduce:

  1. check out a branch other than default branch with changes
  2. make changes, commit, push, etc...
  3. check out PR without those changes

Expected Result:
PR is checked out into clean branch

Actual Result:
Branch is created from current branch and PR is merged in, and VSCode syncs automatically if there is not a merge conflict, polluting pull requests.

Activity

  1. rebornix commented on Oct 22, 2018

    @rebornix
    Peng Lyu (rebornix)
    on Oct 22, 2018
    Contributor

    I'm trying to find a good reproduce and it would be great if Jeremy Gaither (@jeremygaither) can help with that. Firstly let me describe what's happening

    1. We are on branch A with some local changes
    2. We commits all the changes with commit SHA_1 and push the master
    3. Checkout to PR B which doesn't have SHA_1

    Under the hood we will fetch the remote branch for PR B and directly saves to a new local branch by running command

    git fetch <remote> <rbranch>:<lbranch>

    and then we checkout to lbranch. So we are not creating a branch from branch A ideally. Jeremy Gaither (@jeremygaither) can help confirm this is not what you are seeing? Based on the issue report, it seems that after checking out the PR B, you are on a new branch which still has SHA_1, right?

  2. Peng Lyu (rebornix)
    added
    info-neededIssue requires more information from poster
    on Oct 22, 2018

  3. rebornix commented on Oct 29, 2018

    @rebornix
    Peng Lyu (rebornix)
    on Oct 29, 2018
    Contributor

    I can reproduce this issue, will investigate.

  4. Peng Lyu (rebornix)
    added
    bugIssue identified by VS Code Team member as probable bug
    importantIssue identified as high-priority
    and removed
    info-neededIssue requires more information from poster
    on Oct 29, 2018
  5. Kai Maetzel (kieferrm)
    assigned
    Peng Lyu (rebornix)
    on Oct 29, 2018

  6. rebornix commented on Oct 29, 2018

    @rebornix
    Peng Lyu (rebornix)
    on Oct 29, 2018
    Contributor

    Fixed via microsoft/vscode@6d92368

  7. Peng Lyu (rebornix)
    added
    upstream/vscode
    on Oct 29, 2018
  8. Peng Lyu (rebornix)
    added this to the October 2018 milestone on Oct 29, 2018
  9. Peng Lyu (rebornix)
    closed this as completedon Oct 29, 2018
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 bugimportantIssue identified as high-priorityupstream/vscode

Type

No type

Projects

No projects

    Milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions