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

[Feature Request] Allow cherry-picking merge commit #213

Closed
mloskot opened this issue Mar 27, 2019 · 7 comments
Closed

[Feature Request] Allow cherry-picking merge commit #213

mloskot opened this issue Mar 27, 2019 · 7 comments
Milestone

Comments

@mloskot
Copy link

mloskot commented Mar 27, 2019

Fork 1.30 does not support git cherry-pick option -m to specify parent number, so picking changes via merge commit is not supported.

fork-1 30-cherry-pick-merge-commit

@DanPristupov
Copy link
Contributor

DanPristupov commented Mar 27, 2019

Create a commit custom action.

@mloskot
Copy link
Author

mloskot commented Mar 27, 2019

Thanks, this does the trick

fork-custom-action-cherry-pick-merge-commit

It would be nice to have the confirmation prompt before the action is applied though. Similar to the Cherry-pick Commit... command.

@DanPristupov
Copy link
Contributor

It would be nice to have the confirmation prompt before the action is applied though.

Interesting idea. I'll think about it. However, this could be a very broad topic.

@KPhi
Copy link

KPhi commented Sep 5, 2019

Are there plans to add native support for cherry-picking merge commits instead of using a custom action as a workaround?
It is rather confusing UI-wise when I get the option to cherry-pick a commit which then doesn't work for certain commits. On the other hand, the custom action has this problem reversed: it doesn't work for most commits but just for some. In the end I have two commands in the context menu which both don't always work.

@DanPristupov
Copy link
Contributor

Yes. Vote for this issue if you need it.

We sort features by importance (i.e. by number of 👍 in the first commit). https://github.com/ForkIssues/TrackerWin/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc

@DanPristupov
Copy link
Contributor

Hi. We implemented ability to cherry-pick and revert merge commits in Fork 1.40.

@DanPristupov DanPristupov added this to the 1.40 milestone Oct 4, 2019
@mloskot
Copy link
Author

mloskot commented Oct 4, 2019

Thank you!

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

No branches or pull requests

3 participants