Power Platform Community Forum Thread Details

Hi All,

I am aware that the Git version control is an experimental feature in the Power Apps, but we have been using it for almost a year now. And recently since 2 weeks, we have started to encounter problems where the Power App keeps crashing due to merge conflicts, this is the case even if 2 users are editing and saving their changes based on 2 different screens in the Power App.

Observation:
We have been using Github for our version control and from the last commit we see something called a "Smart merge" with 2 different parent ID's(Screenshot attached for reference), once this commit is observed then the app crashes due to failure in resolving merge conflicts between 2 parents.

Is there an alternative to resolve this issue? As it seems to be happening lately to us after using this setup for almost a year.
Looking forward to an answer.

Regards,
PrajwalKacon