# Error Merging Conflicts between Branches

**URL:** <https://forum.bubble.io/t/error-merging-conflicts-between-branches/319608>\
**Category:** Bugs\
**Created:** [April 26, 2024, 2:03pm UTC](https://forum.bubble.io/t/error-merging-conflicts-between-branches/319608 "2024-04-26T14:03:15Z")\
**Posts on this page:** 7\
**Page:** 1

<div class="post-metadata">

**Author:** ![hi.luisacosta](https://sea1.discourse-cdn.com/bubble/user_avatar/forum.bubble.io/hi.luisacosta/32/249869_2.png) [@hi.luisacosta](https://forum.bubble.io/u/hi.luisacosta)\
**Post date:** [April 26, 2024, 2:03pm UTC](https://forum.bubble.io/t/error-merging-conflicts-between-branches/319608/1 "2024-04-26T14:03:15Z")

</div>

I’m seeing this error → anyone else??

Other people on the team getting the same error trying to merge two branches…

 ![Screenshot 2024-04-26 at 9.42.14 AM](https://us1.discourse-cdn.com/bubble/original/3X/8/8/88fee7b4957d8ea2de3246b645b29aa452894328.png)

PS  
1 - yes I tried turning it off an on again  
2 - yes I refreshed the page  
3 - yes I tried with another browser  
4 - yes another user can see this error too  
5 - yes I waited an hour before reporting

---

<div class="post-metadata">

**Author:** ![hi.luisacosta](https://sea1.discourse-cdn.com/bubble/user_avatar/forum.bubble.io/hi.luisacosta/32/249869_2.png) [@hi.luisacosta](https://forum.bubble.io/u/hi.luisacosta)\
**Post date:** [April 26, 2024, 4:21pm UTC](https://forum.bubble.io/t/error-merging-conflicts-between-branches/319608/2 "2024-04-26T16:21:25Z")

</div>

hours later still seeing this issue… cannot get through the conflicts section

---

<div class="post-metadata">

**Author:** ![numarket](https://sea1.discourse-cdn.com/bubble/user_avatar/forum.bubble.io/numarket/32/214493_2.png) [@numarket](https://forum.bubble.io/u/numarket)\
**Post date:** [April 26, 2024, 4:23pm UTC](https://forum.bubble.io/t/error-merging-conflicts-between-branches/319608/3 "2024-04-26T16:23:07Z")

</div>

I am also experiencing this. Bubble support tells me that it’s widespread and that their dev are investigating.

(yes it’s been a tough week to be a bubble user haha)

---

<div class="post-metadata">

**Author:** ![hi.luisacosta](https://sea1.discourse-cdn.com/bubble/user_avatar/forum.bubble.io/hi.luisacosta/32/249869_2.png) [@hi.luisacosta](https://forum.bubble.io/u/hi.luisacosta)\
**Post date:** [April 26, 2024, 4:27pm UTC](https://forum.bubble.io/t/error-merging-conflicts-between-branches/319608/4 "2024-04-26T16:27:46Z")

</div>

Yep… bit difficult to be productive

Glad they’re on it. They just emailed me now saying others are experiencing it as well

---

<div class="post-metadata">

**Author:** ![numarket](https://sea1.discourse-cdn.com/bubble/user_avatar/forum.bubble.io/numarket/32/214493_2.png) [@numarket](https://forum.bubble.io/u/numarket)\
**Post date:** [April 26, 2024, 5:59pm UTC](https://forum.bubble.io/t/error-merging-conflicts-between-branches/319608/5 "2024-04-26T17:59:14Z")

</div>

fyi no update from bubble support but I was able to merge when I tried just now!

---

<div class="post-metadata">

**Author:** ![hi.luisacosta](https://sea1.discourse-cdn.com/bubble/user_avatar/forum.bubble.io/hi.luisacosta/32/249869_2.png) [@hi.luisacosta](https://forum.bubble.io/u/hi.luisacosta)\
**Post date:** [April 26, 2024, 7:05pm UTC](https://forum.bubble.io/t/error-merging-conflicts-between-branches/319608/6 "2024-04-26T19:05:06Z")

</div>

Same here - thanks for the update!

---

<div class="post-metadata">

**Author:** ![system](https://us1.discourse-cdn.com/bubble/original/3X/2/8/2847faa74692c2ffa5d939d3dc3724cdd060d247.png) [@system](https://forum.bubble.io/u/system)\
**Post date:** [May 10, 2024, 2:03pm UTC](https://forum.bubble.io/t/error-merging-conflicts-between-branches/319608/7 "2024-05-10T14:03:19Z")

</div>

Closed on May 10, 2024, 2:03pm UTC

This topic was automatically closed after 14 days. New replies are no longer allowed.
