Distributed version control system Git has released the latest version 2.22 , a new version has been improved on the interactive rebase process of consolidation, including creating a branch, new tracking mechanism from the merger base, improved display, as well as various other during Git bisecting small improvements.
Interactive rebase merges
Suppose we have a warehouse with a structure similar to the following:
o (my-feature)
/
o --- o --- o (master)When we my-featurework, from ( master) to start the branch has changed, so now the warehouse now looks like:
o --- o --- o (my-feature)
/
o --- o --- o --- o --- o (master)Now, how to ensure the my-featurebranches can be merged into a clean master? Git now has a new --rebase-merges, so that it can be operated in the 2.22 Git:
Create a branch from the merge bases
In Git 2.22 in, git branchand git checkout -bsupport merging three basic grammar. To specify that we want from the other two branches (such as Aand B) the merge base to create a branch, you can now run:
$ git branch my-other-feature A...B
# or...
$ git checkout -b my-other-feature A...B
For more information, please see https://github.blog/2019-06-07-highlights-from-git-2-22/