Skip to content

Test: Merge editor CLI support #155819

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
Closed
2 tasks done
bpasero opened this issue Jul 21, 2022 · 1 comment
Closed
2 tasks done

Test: Merge editor CLI support #155819

bpasero opened this issue Jul 21, 2022 · 1 comment
Labels
testplan-item
Milestone
July 2022

Comments

@bpasero
Copy link
Member

bpasero commented Jul 21, 2022 •
edited by miguelsolorio
Loading

Refs: #5770

Complexity: 3

Create Issue

A new command line flag --merge was added to bring up a merge editor. Verify it works as you would expect.

You can see #5770 (comment) for help how to configure Git to use the merge editor.
@bpasero bpasero added this to the July 2022 milestone Jul 21, 2022
@bpasero bpasero changed the title Merge editor CLI support Test: Merge editor CLI support Jul 21, 2022
@ghost ghost assigned miguelsolorio and aiday-mar Jul 26, 2022
@doggy8088

This comment was marked as resolved.

Sign in to view
This was referenced Jul 27, 2022
Open
Closed
Closed
@miguelsolorio miguelsolorio removed their assignment Jul 27, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Sep 12, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
testplan-item
Projects
None yet
Milestone
July 2022
Development

No branches or pull requests
4 participants
@doggy8088 @bpasero @miguelsolorio @aiday-mar