Menu
I am in a clone named /private/gmills, and I ran git merge main_int.
I am seeing a reference to another clone for some other user on a different machine. What does this mean?
I have only 1 remote configured and it isn't pointing to this other clone or machine.
Warning message :
warning: Failed to merge submodule projects/kernel (multiple merges found)
1b64e534e162316a124f98edef6584d7ead1c563: > Merge branch 'main_int' into main_int_infra_xlp
fe1ffcf1f49d8741e03710837fc6e1179b1cf222: > merge from main_int workspace:/private/sriniv/projects/kernel on build02
Information on remote repositories :
git remote -v
origin git@server:flt/root.git (fetch)
origin git@server:flt/root.git (push)
343
A conflict arises when two separate branches have made edits to the same line in a file, or when a file has been deleted in one branch but edited in the other. Conflicts will most likely happen when working in a team environment. There are many tools to help resolve merge conflicts.
To see the beginning of the merge conflict in your file, search the file for the conflict marker <<<<<<< . When you open the file in your text editor, you'll see the changes from the HEAD or base branch after the line <<<<<<< HEAD .
Often, merge conflicts happen when people make different changes to the same line of the same file, or when one person edits a file and another person deletes the same file. You must resolve all merge conflicts before you can merge a pull request on GitHub.
It looks like the git branches you're merging have submodule issues. Look at the .gitmodules and .git/config files within your repositories to find out which submodule is being referenced.
80
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
