I have never met a Figma branch conflict that I could resolve 😥 Not one.
I’ve read all of the relevant help center articles (including this potentially outdated one that focuses on conflicts) and I’ve watched video tutorials, but none of them provide enough information. I understand what conflicts are and why they need to be resolved, I’ve done it in other programs, but I can’t figure out Figma’s particular UI for this process.
I need help understanding this window:
Is anyone aware of... anything anywhere that explains this window in any amount of depth?
Has this UI been updated since the Help center articles were written?
I could try to list all my questions in this forum post but I have a lot, and there might be stuff I dont know that I dont know. I need this window explained to me like I’m 5 😭🙏 Something HAS to exist somewhere out there, right?