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: Cherry-Picking commits from another branch #1685

Closed
kiuru opened this issue May 22, 2017 · 73 comments · Fixed by #11772
Closed

Feature Request: Cherry-Picking commits from another branch #1685

kiuru opened this issue May 22, 2017 · 73 comments · Fixed by #11772
Assignees

Comments

@kiuru
Copy link

@kiuru kiuru commented May 22, 2017

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
Copy link

@nathanpitman nathanpitman commented May 23, 2017

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
Copy link
Author

@kiuru kiuru commented May 24, 2017

@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
Copy link

@nathanpitman nathanpitman commented May 24, 2017

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

screen shot 2017-05-24 at 10 56 13

  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
Copy link
Author

@kiuru kiuru commented May 24, 2017

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
Copy link

@nathanpitman nathanpitman commented May 24, 2017

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
Copy link

@loukia loukia commented May 26, 2017

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

image

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
Copy link
Member

@joshaber joshaber commented Jun 29, 2017

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.

@joshaber joshaber closed this Jun 29, 2017
@MaximilienRedemption

This comment has been minimized.

@ratebeerjoet
Copy link

@ratebeerjoet ratebeerjoet commented Oct 25, 2017

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.

@hagaic

This comment has been minimized.

@dayleparker

This comment has been minimized.

@thenninger

This comment has been minimized.

@sungjin0213

This comment has been minimized.

@okoethibm

This comment has been minimized.

@ha404

This comment has been hidden.

@madelineearp

This comment has been minimized.

2 similar comments
@mandibuswell

This comment has been minimized.

@RomanHalaburda

This comment has been minimized.

@j-f1
Copy link
Contributor

@j-f1 j-f1 commented Apr 13, 2018

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.

@fabatista

This comment has been minimized.

@sffc

This comment has been minimized.

@dbking77
Copy link

@dbking77 dbking77 commented Oct 31, 2018

+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

@nathanpitman

This comment has been minimized.

@thenninger

This comment has been hidden.

@kiuru

This comment has been hidden.

@billygriffin
Copy link
Contributor

@billygriffin billygriffin commented Mar 17, 2021

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
Copy link

@Seb33300 Seb33300 commented Mar 30, 2021

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
Copy link

@Seb33300 Seb33300 commented Mar 30, 2021

Fixed in 2.7.1

@tidy-dev
Copy link
Contributor

@tidy-dev tidy-dev commented Mar 30, 2021

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

@uguraktas
Copy link

@uguraktas uguraktas commented Mar 30, 2021

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

Expected feature 🎉

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

Successfully merging a pull request may close this issue.