The new commit will have the previous commits from both myidea and master listed as parents. However, if there are conflicts—places where the same part of a file was changed differently in each branch ...