Merge into
Apple's XCode has a nice feature I miss in PlasticSCM.
It allows you to merge your current branch into another (for instance /main) and after the merge switch to it.
In PlasticSCM the workflow is switch to /main and merge the other branch into the current (/main) branch.
XCode's added merge into feels a bit more natural if you're in a branch you want to close with a merge.
wvd_vegt
shared this idea
No answer from the submitter :-S
-
Hi,
You know we've a feature called "merge-to" that is basically a very similar thing, correct? It let's you merge your branch main/task001 into main provided there are no merge conflicts.
If there are merge conflicts we always encourage moving to the destination branch, then merge from source for a reason: you need to build and test your changes prior to checkin to make sure they're fine.
What you're proposing is something like:
* I'm on main/task001 and I want to merge to main
* Let's simply do the "merge into"
* And once I'm done I'm magically at "main"Correct?
At the end of the day is exactly as "switch to destination" and "merge from source" but doing it behind the scenes... Do you think it is so useful? I can't see it. But I'm obviously biased.