Issues with pulling Config file from GIT

Help Studio
, , ,
1

Hi,

I was keeping config file on the sharedrive, however I’ve changed my approach and prefer to keep it at the same place where the xml files so it is published always with the package.

Nonetheless, while I am trying to push the file into the git and then using pull(rebase) I am getting the merge conflict. Finally .xlsm file is not readable.
image

I was not able to any similar topic so I am not sure whether I am the only one with this issue?

1 Like
2

Hey @mateusz.gajda

When you say Merge conflict does the file changed by someone then ?

Thanks
#nK

3

Hi @Nithinkrishna,

Yes, it is being changed by someone else in my company and also other way round if I change someone else’s file and push it into the GIT he is having the same issue while trying to pull it.

1 Like
4

So then @mateusz.gajda

I guess that’s where something is happening making the file corrupt.

Thanks
#nK