Hi everyone 
,
Say goodbye to the hassle of manually resolving merge conflicts!
We’re excited to introduce the Quick Resolve option:
- With this option, you can instantly choose whether to keep your version, or the incoming version for each conflicted file
- You can even apply this choice to all files at once, letting you dive back into your tasks soon.
For those who prefer a hands-on approach, you can still sort out the conflicts in the code editor using the Manual Resolve option.
Cheers! 