Git merge conflict

Hi, I was trying to use the git integration for Sisense dashboards for version control. It works well for saving previous versions of a project should a customer want to see a previous version. However, it just seems impossible to work with a team on a single dashboard. I have noticed that there is no support for merging. However, when I try to push and my team-mate tries to push, and we try pulling the branches to branch main we get a merge conflict. Is there any solution to this?

jacobd

Posted 2 years ago·Last reply 2 years ago

1 comment

DRay

·2 years ago

Hello jacobd.

Thank you for reaching out.

Can you take a look at this document and let me know if it helps?

https://docs.sisense.com/main/SisenseLinux/sisense-git-integration-limitations.htm

Thank you.