Strange output during git merge

I am in a clone named / private / gmills and I ran git merge main_int .

I see a link to another clone for another user on another machine. What does it mean?

I have only 1 remote configurator, and it does not point 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 about remote repositories:

 git remote -v origin git@server :flt/root.git (fetch) origin git@server :flt/root.git (push) 
+6
source share
1 answer

It looks like the git branches you are merging have problems with the submodule. Look at the .gitmodules and .git/config files in your repositories to find out which submodule is referencing.

+1
source

Source: https://habr.com/ru/post/903115/


All Articles