web
You’re offline. This is a read only version of the page.
close
Skip to main content

Notifications

Announcements

Community site session details

Community site session details

Session Id :
Power Platform Community / Forums / Power Apps / Power App which is con...
Power Apps
Unanswered

Power App which is connected to a Git version control keeps crashing due to merge conflicts

(0) ShareShare
ReportReport
Posted on by

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

Categories:
I have the same question (0)

Under review

Thank you for your reply! To ensure a great experience for everyone, your content is awaiting approval by our Community Managers. Please check back later.

Helpful resources

Quick Links

Forum hierarchy changes are complete!

In our never-ending quest to improve we are simplifying the forum hierarchy…

Ajay Kumar Gannamaneni – Community Spotlight

We are honored to recognize Ajay Kumar Gannamaneni as our Community Spotlight for December…

Leaderboard > Power Apps

#1
WarrenBelz Profile Picture

WarrenBelz 765 Most Valuable Professional

#2
Michael E. Gernaey Profile Picture

Michael E. Gernaey 343 Super User 2025 Season 2

#3
Power Platform 1919 Profile Picture

Power Platform 1919 272

Last 30 days Overall leaderboard