nuaj/nuaj

Resolve files conflicts #13

New issue

Open

opened 2025-01-10 11:37:27 +01:00 by Madeorsk · 0 comments

Madeorsk commented

2025-01-10 11:37:27 +01:00

Owner

Implement a files conflicts resolution process with 3 possibilities:

keep one version of all the available versions.
keep one version of an entire directory (all conflicted files from this directory will come from the same remote / local state).
custom conflict handling, inserting all the versions of the file (or all files of a directory), letting the users perform the merges that they want.

Implement a files conflicts resolution process with 3 possibilities: - keep one version of all the available versions. - keep one version of an entire directory (all conflicted files from this directory will come from the same remote / local state). - custom conflict handling, inserting all the versions of the file (or all files of a directory), letting the users perform the merges that they want.