# Launched: New Resolving Conflicts Flow

**URL:** <https://community.holistics.io/t/launched-new-resolving-conflicts-flow/2334>\
**Category:** Product Releases\
**Tags:** as-code\
**Created:** [December 18, 2024, 10:05am UTC](https://community.holistics.io/t/launched-new-resolving-conflicts-flow/2334 "2024-12-18T10:05:44Z")\
**Posts on this page:** 1\
**Page:** 1

<div class="post-metadata">

**Author:** ![vu.duong](https://community.holistics.io/user_avatar/community.holistics.io/vu.duong/32/483_2.png) [@vu.duong](https://community.holistics.io/u/vu.duong)\
**Post date:** [December 18, 2024, 10:05am UTC](https://community.holistics.io/t/launched-new-resolving-conflicts-flow/2334/1 "2024-12-18T10:05:44Z")

</div>

Hi everyone 👋,

Say goodbye to the hassle of manually resolving merge conflicts!

[![](https://community.holistics.io/uploads/default/original/2X/0/0b74e6bfc762497e7ffe6aea3e5262e3347430a6.jpeg "Resolve Conflicts in Development") ](https://www.youtube.com/watch?v=6o7HaSnOBEE)

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! 🍻