All geek questions in one place

Merge without first updating?

Say you have two branches, Stable and Unstable. Suppose I work in Unstable, and when I'm done, I do my work and want to merge the new changes into Stable.

Should I upgrade to Stability before merging, or can I merge the changes into "Stable", but do I have a mirrored head of the working copy of "Unstable"?

+4
source share
1 answer

To combine Unstable into Stable , you must first upgrade to Stable .

Mergers are directed. The direction of the merge is controlled by the revision of your working copy.

From the hg merge help :

combine working directory with another revision

The current working directory has been updated with all the changes made to the requested revision since the last general version of the predecessor.

+4
source

Source: https://habr.com/ru/post/1347102/

More articles:


All Articles