Skip to content

Comments

ghmerge: support stopping interactive rebase for adaptations#102

Closed
DDvO wants to merge 1 commit intoopenssl:masterfrom
DDvO:ghmerge_support-stop
Closed

ghmerge: support stopping interactive rebase for adaptations#102
DDvO wants to merge 1 commit intoopenssl:masterfrom
DDvO:ghmerge_support-stop

Conversation

@DDvO
Copy link
Contributor

@DDvO DDvO commented Nov 26, 2021

Sometimes it is helpful to stop an interactive rebase, e.g., for fixing typos.
So far, ghmerge ignored any 'b' or 'e' commands given by the user,
and in effect the rebase was incomplete and the merge went wrong.
This is fixed here.

@DDvO DDvO changed the title ghmerge: support stopping interactive rebase for adaptations ghmerge: support stopping interactive rebase for adaptations Nov 26, 2021
@mspncp
Copy link
Contributor

mspncp commented Nov 26, 2021

Just a spontaneous thought: instead of polling and forcing the user to spawn a separate shell, why not just terminate and implement a --resume (or --continue) option instead?

@mspncp
Copy link
Contributor

mspncp commented Nov 26, 2021

OTOH, on posix operating systems, the user could simply suspend ghmerge, fix the problem, and resume it.

@paulidale
Copy link
Contributor

My workflow here is to use a second window to make changes while the first is sitting at the should this be committed prompt. Make the changes, then say yes to commit.

@DDvO
Copy link
Contributor Author

DDvO commented Nov 27, 2021

Just a spontaneous thought: instead of polling and forcing the user to spawn a separate shell, why not just terminate and implement a --resume (or --continue) option instead?

This would be a hassle to implement.
Note that this shell script remembers various state information in variables, which would need to be saved and restored.

@DDvO
Copy link
Contributor Author

DDvO commented Dec 3, 2021

ready to merge

openssl-machine pushed a commit that referenced this pull request Dec 3, 2021
Reviewed-by: Paul Dale <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #102)
@t8m
Copy link
Member

t8m commented Dec 3, 2021

Merged. Thank you.

@t8m t8m closed this Dec 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants