![]() ![]() In most cases, however, both branches would move forward with different commits. Both branches then share the exact same history (and no additional “merge commit” is necessary). In Git, this simplest form of integration is called a “fast-forward” merge. In this case, the integration is dead simple: Git can just add all the new commits from branch-B on top of the common ancestor commit. Its last commit in this example is, therefore, also the common ancestor. So their latest revisions are important, of course.Ĭombining these three commits performs the integration that we’re aiming for.Īdmittedly, this is a simplified scenario - one of the two branches ( branch-A) hasn’t seen any new commits since it was created, which is very unlikely in most software projects. Remember that the goal of an integration is to combine the current states of two branches.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |