Merging the branches may result in a merge conflictThere are two branches in this repositoryThe branches have already been mergedWe need to create a new branch to continue
Perfect! There are two branches with commits that have changed the same file, which may lead to a merge conflict.
Almost! There are two branches with commits that have changed the same file, which may lead to a merge conflict.