#10542 Ability to merge local git branches #25731
Conversation
|
@gecharo, thanks for your PR! By analyzing the history of the files in this pull request, we identified @joaomoreno and @jrieken to be potential reviewers. |
|
@gecharo, It will cover your contributions to all Microsoft-managed open source projects. |
|
@gecharo, thanks for signing the contribution license agreement. We will now validate the agreement and then the pull request. |
extensions/git/src/commands.ts
Outdated
| @@ -17,15 +17,21 @@ import * as nls from 'vscode-nls'; | |||
|
|
|||
| const localize = nls.loadMessageBundle(); | |||
|
|
|||
| class CheckoutItem implements QuickPickItem { | |||
| class CheckoutBasicItem implements QuickPickItem { | |||
There was a problem hiding this comment.
Why not instead of this simply create a new class MergeItem implements QuickPick?
extensions/git/src/commands.ts
Outdated
| .map(ref => new CheckoutRemoteHeadItem(ref)); | ||
|
|
||
| const picks = [...heads, ...remoteHeads]; | ||
| const placeHolder = 'Select a ref to checkout'; |
There was a problem hiding this comment.
Where's the localize call? Remember, Code needs to be localized for other languages. Also, the sentence is wrong. It should be something like Select a branch to merge from
|
Paging @gecharo ... 👋 |
|
Thanks! 🍻 |
Adds ability to merge git branches within git extension. Feature request #10542, workflow as descibed by mherodev.