Say goodbye to the hassle of manually resolving merge conflicts!
We’re thrilled to introduce the Quick Resolve option, which allows you to:
- Instantly choose whether to keep your version, or the incoming version for each conflicted file.
- Apply your choice to all files at once, so you can quickly return to your tasks.
For those who prefer a more hands-on approach, the Manual Resolve option remains available, letting you sort out the conflict in the code editor.
Check it out in action: