Issue in merge v1.3.1

I’m working on the develop branch, which was at v1.2.1. I merged in v1.3.0 and then v1.3.1, resolving conflicts by taking only the incoming changes since we didn’t have modifications in those files. However, after merging v1.3.1, I’m seeing some unexpected codebase changes caused by a reverted commit. Can someone help me understand what’s happening here? @Prastoin
No description
5 Replies
Jay Patel
Jay PatelOP3mo ago
No description
Prastoin
Prastoin3mo ago
Hey @Jay Patel lets have a call Available in 10 mins ?
Jay Patel
Jay PatelOP3mo ago
Hey @Prastoin ,thanks for being available so quickly. But I had to step away from my desk for a bit. I’ll ping you later so we can connect when we’re both available.
Prastoin
Prastoin3mo ago
Hey we can setup a call on monday CEST
Jay Patel
Jay PatelOP3mo ago
Sure, could you please share your tentative availability so I can plan accordingly?

Did you find this page helpful?