4 ms·
Indeed, thanks. Something that carry the meaning "the branch we want to use as a starting point" and "the other branch we want to integrate in the previous one
by psychoslave 7mo ago
Indeed, thanks.
Something that carry the meaning "the branch we want to use as a starting point" and "the other branch we want to integrate in the previous one" is what I had in mind, but it might not fit all situations in git merge/rebase.
- wakawaka28 7mo agoAssuming you have to start on one of the branches being merged, "current" is a good name for the one you started on. "Other" is good enough for the other one. By the way I found out that octopus merges never succeed in case of conflicts. I'm not even sure if prerecorded resolutions work in that case. You're supposed to do a series of normal merges instead if you have conflicts.