Do not input private or sensitive data. View Qlik Privacy & Cookie Policy.
Skip to main content

Announcements
See why IDC MarketScape names Qlik a 2025 Leader! Read more
cancel
Showing results for 
Search instead for 
Did you mean: 
Anonymous
Not applicable

I get error when I try to pull from Git repository

Hello everyone,

 

I am working on Talend Big Data Platform; I want to commit my work on Git remote repository but before doing this, I want to pull the last update from it.

 

I get this kind of error, multiple times:0683p000009M2m5.png

 

How can I solve it?

Thank you in advance,

 

Gianluca

 

 

Labels (2)
3 Replies
manodwhb
Champion II
Champion II

@Moe ,this GIT configuration issue i believe,

core.useRecursiveMerge = true to Gerrit config file

check the below links.

https://stackoverflow.com/questions/12223439/how-to-work-around-multiple-merge-bases-error-in-egit-e...

https://groups.google.com/forum/#!topic/repo-discuss/LXgVSBqpKqM

Anonymous
Not applicable
Author

Hi @manodwhb ,

Thank you for your answer.

Where may I find Gerrit config file ? In Talend's installation folders ?

I am not able to find it. Can you help me?

Thank you

 

manodwhb
Champion II
Champion II

@Moe ,i relay do not have that path it will be there where you have installed GIT.