Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Editor: Reference Current, Base, Theirs by SHA rather than ref to improve extension support #164686

Closed
hediet opened this issue Oct 26, 2022 · 1 comment · Fixed by #165051
Closed

Merge Editor: Reference Current, Base, Theirs by SHA rather than ref to improve extension support #164686

hediet opened this issue Oct 26, 2022 · 1 comment · Fixed by #165051
Assignees
@hediet
Labels
feature-request Request for new features or functionality merge-editor verification-needed Verification of issue is requested verified Verification succeeded
Milestone
November 2022

Comments

@hediet
Copy link
Member

hediet commented Oct 26, 2022

See gitkraken/vscode-gitlens#2297
@hediet hediet added feature-request Request for new features or functionality merge-editor labels Oct 26, 2022
@hediet hediet added this to the November 2022 milestone Oct 26, 2022
@hediet hediet self-assigned this Oct 26, 2022
@hediet hediet mentioned this issue Oct 31, 2022
Merged
@hediet
Copy link
Member Author

hediet commented Oct 31, 2022 •
edited
Loading

Verification steps:
Verify that gitlens works in the merge editor (you need a git based conflict for this):
image

hediet added a commit that referenced this issue Oct 31, 2022
@hediet
Implements #164686
d27d0c2
hediet added a commit that referenced this issue Oct 31, 2022
@hediet
Merge pull request #165051 from microsoft/hediet/nearby-worm
6800f96 
Implements #164686
@hediet hediet closed this as completed Nov 1, 2022
@hediet hediet added the verification-needed Verification of issue is requested label Nov 28, 2022
@alexr00 alexr00 added the verified Verification succeeded label Nov 29, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Dec 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@hediet hediet

Labels
feature-request Request for new features or functionality merge-editor verification-needed Verification of issue is requested verified Verification succeeded
Projects
None yet
Milestone
November 2022
Development

Successfully merging a pull request may close this issue.

Implements #164686 microsoft/vscode
2 participants
@hediet @alexr00