Feature Request: Cherry-Picking commits from another branch

[kiuru]

Description

Would be great if I could cherry-pick commits from another branch. That would be very useful and often used feature in our company.

Version

GitHub Desktop version: 0.5.7
OS version: Microsoft Windows [Version 10.0.14393]

Steps to Reproduce

For example, I would like to select "cherry-pick..." and then it opens window where I could tag specific commits from another branches to my active branch.

And same thing step-by-step:

1. Select "Branch" tab from client's toolbar and select "cherry-pick...".
2. New window opens where I can tag specific commits from another branches to my active branch.

[nathanpitman]

Something I have requested many times for the old desktop client so adding my vote here to see this become a reality in the new GitHub Desktop. 👍

[kiuru]

@nathanpitman Do you have any good advice how to reproduce this new feature to project contributors? Is my example good enough or will come to mind some better one? I thought that was the best one.

[nathanpitman]

Here's how it worked in GitBox (my previous fave OS X Git client):

1. Pick branch you want to cherry pick from on the right in the title bar (development).
2. Commits which are not in the branch on the left (master) are denoted with a blue marker in the commit list
3. Right click on a commit with a blue marker and then choose 'Cherry-pick' from the context menu
4. This commits the 'commit' you cherry picked to the local branch
5. Switch branch on the right back to origin/master and push changes
6. Done

Pretty quick and easy. :)

[kiuru]

Sorry for my lack of understanding, but when I choose "origin/development" on the right in the title bar, does it means commits on below (in the middle of screen) will update according to this branch?

That function is not available at this moment on GitHub Desktop client. Is there anything else good reasons than cherry-pick why they should also add this function to client?

I mean I trying to figure out the most easily way to implement cherry-pick to the current version of client. :)

[nathanpitman]

I don't really care how it's implemented, so long as there is a low friction way to cherry pick a commit and merge it into another branch. :)

[loukia]

As an feature in UI, this could also be a improvement on current feature "Branch / Merge into current branch".

In 0.5.8, there is a text which says for example "This will bring in 7 commits from master". You can select "Merge into current branch" or close the window.

If there would be possibility to view and select (i.e cherry-pick) from these commits, it would be a great solution for this feature request.

[joshaber]

Thanks for the suggestion!

This idea is interesting for the future, but this is beyond the scope of our current roadmap.

I'm going to add the future-proposal label to this issue and close it out, so that we don't get overwhelmed with our backlog! We'll revisit these as part of our next planning session.

[ratebeerjoet]

Yes, it would be great to be able to select and deselect which commits should be included. A simple checkbox and an option to "[ X ] De/Select All" at the top that you can click once to select all and click again to deselect all.

[j-f1]

Please use the 👍 button on the original comment in the issue instead of commenting +1 so people subscribed to this issue don’t get unnecessary notifications.

[dbking77]

+1 for website support for cherry-picking one or more commits to make a new PR. Doesn't need to support conflict resolution, just allow "clean" cherry-picks in browser.

I often use cherry-pick to backport small fixes to other branches pretty often, and the command-line option is pretty tedious:

git checkout release_branch_1.0
git pull upstream release_branch_1.0  # make sure local branch is up to date
git checkout -b backport_fix_for_release_1.0   # make a new branch for back-port
git cherry-pick <some commit> <some other commit>  # grab fixes (sometimes more than one commit)
git push origin  backport_fix_for_release_1.0 
# now use github to make PR of backport_fix_for_release_1.0 against release_branch_1.0

[billygriffin]

Hi folks! We've released most of the cherry picking work to the beta version, though we are planning to iterate on a few things with the drag and drop flow in the next few days. Would anyone who would use cherry picking in Desktop be interested in doing a 30 minute usability test with us to see how the flow feels on beta? If you aren't using the beta, you can download it here: https://github.com/desktop/desktop#beta-channel

Also, if you have a chance to use it, please feel free to respond here as well with feedback. ❤️

[Seb33300]

Can someone please explain how cherry picking works?

Just installed the update, but the only change I can find if a New badge on the History tab (I don't know why, nothing changed since the previous version except that the diff was on slip mode by default instead of unified).
And nothing related to cherry picking in context menus.

[Seb33300]

Fixed in 2.7.1

[tidy-dev]

@Seb33300 Sorry for the confusion! As @Seb33300 said, cherry-picking is in release 2.7.1 now!

[uguraktas]

@Seb33300 Sorry for the confusion! As @Seb33300 said, cherry-picking is in release 2.7.1 now!

Expected feature 🎉