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.

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

Add av cherry-pick #248

Open
draftcode opened this issue Mar 28, 2024 · 6 comments · May be fixed by #495
Open

Add av cherry-pick #248

draftcode opened this issue Mar 28, 2024 · 6 comments · May be fixed by #495

Comments

@draftcode
Copy link
Contributor

draftcode commented Mar 28, 2024

Run av stack restack after a cherry pick so that the stacks are aligned.

@kolharsam
Copy link

is this issue open for contributions?

@jainankit
Copy link
Contributor

jainankit commented Sep 27, 2024

is this issue open for contributions?

Yes, absolutely. @draftcode can you add some more context to this ticket?

@kolharsam
Copy link

Hey @draftcode @jainankit
Just wanted to provide a gentle nudge regarding this!

Thanks!

@jainankit
Copy link
Contributor

jainankit commented Oct 11, 2024

Let me add the context. git cherry-pick as a command already exists: https://git-scm.com/docs/git-cherry-pick

When working with av CLI, it would be nice to have a more native experience of managing the cherry-pick. So in addition to the typical cherry-pick behavior where a commit is added to the current branch, this command should also run the av stack restack command internally, so that the entire stack is updated.

Note that this command should NOT be pushing the changes to remote.

It should support all capabilities of the standard git cherry-pick, and should gracefully handle scenarios where the cherry-pick fails due to conflict, allowing user to continue after resolving the issue.

av cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]
		  [-S[<keyid>]] <commit>…​
av cherry-pick (--continue | --skip | --abort | --quit)

If the additional params ([--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff][-S[<keyid>]]) are too complicated to support, it's ok to not support them at the beginning, but we should still handle the failure scenarios and not leave dev env in a bad state.

@kolharsam
Copy link

Hey folks! @jainankit @draftcode

Sorry that I haven't been able to work on the issue as of yet! I'm just busy with all of the tasks during this part of the semester. I will give you folks an update in a couple of weeks time.

Appreciate your understanding!

@kolharsam kolharsam linked a pull request Dec 21, 2024 that will close this issue
@kolharsam
Copy link

Hey @draftcode @jainankit

I've started work on this #495 sorry I took a long time to get back to this, but yeah, the semester ended yesterday and I'm here on it.

I would appreciate any feedback on the current status, but yeah, thanks again for the opportunity to contribute.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants