Loading

Not able to get the code from GIT - Tortise GIT repository

Kumar AU

Hi,

I am unable to get the source code from Tortise Git, Kindly help me

Auto-merging AgentConnectIntegrationLibrary

CONFLICT (submodule): Merge conflict in AgentConnectIntegrationLibrary

Automatic merge failed; fix conflicts and then commit the result.

warning: Failed to merge submodule AgentConnectIntegrationLibrary (not checked out)

git did not exit cleanly (exit code 1) (6630 ms @ 7/11/2017 8:03:30 PM)

1 Reply

Know the answer? Post it — somebody with the same question will find it here.

Nilesh Shah9y ago
the error means that you have some changes in your local files which has also changed in Git repo, so it requires manual merging, it cannot automatically merge.

If you are using a UI tool, then you can see the conflicts and merge manually
0