Otherwise, it will throw an error indicating that there was a merge conflict. If there were not any changes in v2.0-beta since the v2.0-beta-mynewfeature branch was created, this will work smoothly. The merging process consists of pulling from the parent to get any new changes, then issuing the merge command to merge v2.0-beta-mynewfeature -> v2.0-beta. New branches should be created for each development sprint, and then as soon as they are tested in a branch named something like v2.0-beta-mynewfeature, they can be merged back into their parent branch. In this hypothetical situation, development commits should not be applied directly to the v2.0-beta branch though. The active development would may be done another v2.0-beta branch. The stable build would probably be part of the master branch.
For instance, lets say a development version of an application is being maintained alongside a stable production build.
Branches are versitile and can be used for large-scale revisions or for minor bug fixes.
0 kommentar(er)
