The applicable changes are those made after the last commit that's common to both branches. For example, Git will apply a fast-forward merge on a local branch that you only update by pulling from its remote counterpart branch.Ī no-fast-forward Git merge generates a new target branch "merge commit" that integrates source branch changes with target branch changes. By default, Git uses a fast-forward merge whenever possible. Otherwise, the default merge type will be a no-fast-forward merge.Ī fast-forward Git merge can never have a merge conflict because Git won't apply a fast-forward merge if the tip of the target branch has diverged from the source branch.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |