3 ms·
not exactly, i'm referring to the difficulty in undoing a committed merge if you don't use the --no-ff flag as suggested in this article. i believe this is pre
by jheriko 13y ago
not exactly, i'm referring to the difficulty in undoing a committed merge if you don't use the --no-ff flag as suggested in this article.
i believe this is precisely why they suggest using it - because on private branches you can undo merges in much more destructive ways which are not viable on a shared repo - they suggest using --no-ff for when you merge in a feature branch
(edit: it is precisely why and there is an article linked from the original discussing the pros/cons of merge and rebase)
- sofal 13y agoWhat on Earth does "unpick" mean and where does that term come from?
- jheriko 13y agoi'm using it in the sense of English - its not a specialist term or a piece of jargon. i.e. I mean 'undo', 'revert', 'reverse' - unpick just feels more appropriate because its often a fiddly process if you are doing anything more than a simple revert or back-out type operation.
- pessimizer 13y agoSounds like the opposite of cherry-pick.
- jheriko 13y agoi'll edit it since its confusing. in hindsight undo is the obvious choice of word