Skip to content

fix(config): update default value of maxConflicts #929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2025
Merged

fix(config): update default value of maxConflicts #929

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions users/config.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,8 +503,8 @@ The following child elements may exist:
.. option:: folder.maxConflicts

The maximum number of conflict copies to keep around for any given file.
The default, ``-1``, means an unlimited number. Setting this to ``0`` disables
conflict copies altogether.
The default is ``10``. ``-1``, means an unlimited number.
Setting this to ``0`` disables conflict copies altogether.

.. option:: folder.disableSparseFiles

Expand Down