microsoft / microsoft/vscode-pull-request-github

Support using `pushRemote` and `merge` to detect the PR of a branch

Open
#7,944 0 comments 1 reaction 0 assignees View on GitHub

Nobody has claimed this yet.

feature-request
Dominant language
TypeScript
Stars
2.6k
Forks
795
Avg merge
1d 4h
Merged PRs (30d)
46

Description

My branches are set up like this (a triangle workflow, but with just one remote):

[branch "feature1"]
	pushRemote = origin
	remote = origin
	merge = refs/heads/master
[branch "feature2-using-feature1"]
	pushRemote = origin
	remote = origin
	merge = refs/heads/feature1

Currently it seems like this plugin is matching the "merge" setting of the branches against the "from" setting of the PR to decide which branch should be checked-out for a PR. However this results in feature2-using-feature1 being associated with feature1's PR.

I couldn't find a setting to make this work. I'm working around it by going into .git/config and manually updating the vscode-merge-base and github-pr-owner-number settings for each branch, but it would be great if there's some way to configure this plugin so that PRs can be associated with branches based on the pushRemote setting and matching names of the local branches with those on the pushRemote (https://git-scm.com/docs/git-config#Documentation/git-config.txt-branchnamepushRemote)

Contributor guide

No contributing guide indexed for this repository

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

Research direction

No files or tests are named. Start by locating the branch-to-PR association logic and trace how branch merge settings are matched to a PR's from branch. Compare that behavior with Git's pushRemote and local branch names; done means the triangle workflow associates each PR with the intended local branch without manual .git/config edits.

Written by the indexing model from the issue text.

Assessment

Tech stack
git, github, typescript, vscode
Domain
developer-experience, devtools, tooling
Issue type
Feature
Difficulty
4/5
Estimated time
3-5 days
Activity status
Stale
Clarity
Mostly clear
Newbie friendliness
35/100

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.