4 ms·

Genuinely curious: what would you rename cherry picking, fast forwarding, and rebasing?

loudthing 5y ago
I would eliminate these tasks from the aspect of the user and provide a more straight forward way to accomplish the same intent. You make a good point though because this is easier said than done with a typical terminal based application.
- jamesmontalvo3 5y ago
  You want to remove fast-forward and rebase from a graph based version control system? What would you do instead? Always merge?
  - apocolyps6 5y ago
    It's been working for me so far :)
  - aeneasmackenzie 5y ago
    It sounds like he wants a GUI so you’d just drag and drop.
  - emodendroket 5y ago
    Isn't that the hg concept, no history rewrites? Well it's more nuanced than that but you have much less freedom, I think
- rezonant 5y ago
  I don't think it makes sense to eliminate these, but I'll toss in "Take Commit" as an alternative name that might be more obvious than "Cherry Pick". Still, once you know it, you know it. You'd still need to understand what Take Commit means to use it effectively, but it would make it easier for a dev to learn it the first time.
  - _ea1k 5y ago
    Take commit sounds like some weird version of merging a pull request to me. Like you've sent me some commits and now I'm going to take them. Cherry pick on the other hand has a non-technical definition that closely approximates what it does in git: https://www.merriam-webster.com/dictionary/cherry-pick https://www.merriam-webster.com/dictionary/cherry-pick
kiklion 5y ago
I’d answer that if I knew what they did. But I’ve only used git for 3 years now, so still a novice I guess.
- jamesmontalvo3 5y ago
  If your git history were a tree: cherry picking is ripping a leaf off and gluing it some arbitrary place on the tree, fast-forwarding is ripping the leaf off and moving it to the end of the branch it’s on, and rebasing is ripping a branch off and gluing it somewhere else. EDIT: cherry picking is actually making a copy of the leaf and gluing it elsewhere. And fast forwarding isn’t really moving the leaf, it’s taking the leaf you call BRANCHNAME and now calling a leaf further up the branch BRANCHNAME.
  - rezonant 5y ago
    Yeah, all these are useful to prune the bonsai. It matters more when the project is big or has lots of branches, of course, but they have benefits even for a single developer.
mbfg 5y ago
agreed.. cherry-picking is actually a ridiculously good name.

I would eliminate these tasks from the aspect of the user and provide a more straight forward way to accomplish the same intent. You make a good point though because this is easier said than done with a typical terminal based application.

jamesmontalvo3 5y ago
You want to remove fast-forward and rebase from a graph based version control system? What would you do instead? Always merge?
- apocolyps6 5y ago
  It's been working for me so far :)
- aeneasmackenzie 5y ago
  It sounds like he wants a GUI so you’d just drag and drop.
- emodendroket 5y ago
  Isn't that the hg concept, no history rewrites? Well it's more nuanced than that but you have much less freedom, I think
rezonant 5y ago
I don't think it makes sense to eliminate these, but I'll toss in "Take Commit" as an alternative name that might be more obvious than "Cherry Pick". Still, once you know it, you know it. You'd still need to understand what Take Commit means to use it effectively, but it would make it easier for a dev to learn it the first time.
- _ea1k 5y ago
  Take commit sounds like some weird version of merging a pull request to me. Like you've sent me some commits and now I'm going to take them. Cherry pick on the other hand has a non-technical definition that closely approximates what it does in git: https://www.merriam-webster.com/dictionary/cherry-pick https://www.merriam-webster.com/dictionary/cherry-pick

kiklion 5y ago

I’d answer that if I knew what they did. But I’ve only used git for 3 years now, so still a novice I guess.

jamesmontalvo3 5y ago
If your git history were a tree: cherry picking is ripping a leaf off and gluing it some arbitrary place on the tree, fast-forwarding is ripping the leaf off and moving it to the end of the branch it’s on, and rebasing is ripping a branch off and gluing it somewhere else. EDIT: cherry picking is actually making a copy of the leaf and gluing it elsewhere. And fast forwarding isn’t really moving the leaf, it’s taking the leaf you call BRANCHNAME and now calling a leaf further up the branch BRANCHNAME.
- rezonant 5y ago
  Yeah, all these are useful to prune the bonsai. It matters more when the project is big or has lots of branches, of course, but they have benefits even for a single developer.

mbfg 5y ago

agreed.. cherry-picking is actually a ridiculously good name.