xaizek / vifm (License: GPLv2+) (since 2018-12-07)
Vifm is a file manager with curses interface, which provides Vi[m]-like environment for managing objects within file systems, extended with some useful ideas from mutt.
Commit 53b2dcecaa2b8e2581f984d76af0e9c739348f0b

Document "Append all" conflict resolution option
Author: xaizek
Author date (UTC): 2026-10-17 10:45
Committer name: xaizek
Committer date (UTC): 2026-10-17 10:45
Parent(s): 83c43bb0410d8a3d106482c291928d28bb850677
Signing key: 99DC5E4DB05F6BE2
Tree: a9b2a2c896b75cf6610e3f4d41023cab2a602ac9
File Lines added Lines deleted
AUTHORS 2 1
ChangeLog 3 3
data/man/vifm.1 6 0
data/vim/doc/app/vifm-app.txt 6 0
File AUTHORS changed (mode: 100644) (index e309c7319..c9afa1db8)
... ... Zhipeng Xue fixed a couple of potential NULL dereferences.
167 167
168 168 Rostislav Tolushkin (a.k.a. nullptr-deref) implemented :regedit command. Rostislav Tolushkin (a.k.a. nullptr-deref) implemented :regedit command.
169 169
170 Marcin Kurczewski (a.k.a. rr-) fixed limited size of IPC buffer.
170 Marcin Kurczewski (a.k.a. rr-) fixed limited size of IPC buffer and
171 implemented "Append all" conflict resolution option.
171 172
172 173 voh9eepah fixed available file-system space size on FreeBSD. voh9eepah fixed available file-system space size on FreeBSD.
173 174
File ChangeLog changed (mode: 100644) (index 3c9e9fea4..4f0c7bd29)
21 21 Changed :sp[lit] and :vs[plit] to expand macros and environment variables Changed :sp[lit] and :vs[plit] to expand macros and environment variables
22 22 in their parameter. Thanks to agguser. in their parameter. Thanks to agguser.
23 23
24 Added "[A]ppend all" conflict resolution option, which appends tails
25 of all conflicting regular files without asking again.
26
27 24 Added <help> :*map argument that enables providing description for the Added <help> :*map argument that enables providing description for the
28 25 mapping with the same curly braces syntax as used by :file[x]type. mapping with the same curly braces syntax as used by :file[x]type.
29 26
 
76 73 Added 'fileoptions' option to allow hiding missing programs in the :file Added 'fileoptions' option to allow hiding missing programs in the :file
77 74 menu. Thanks to aksr. menu. Thanks to aksr.
78 75
76 Added "[A]ppend all" conflict resolution option, which appends tails
77 of all conflicting regular files without asking again. Patch by rr-.
78
79 79 Updated utf8proc to v2.11.3. Updated utf8proc to v2.11.3.
80 80
81 81 Made documentation on which :commands can have comments a bit more Made documentation on which :commands can have comments a bit more
File data/man/vifm.1 changed (mode: 100644) (index f3cb26f35..a3fb17a1b)
... ... destination is 300 bytes in size, the last 700 bytes of the source are
8049 8049 appended. This action is intended for resuming interrupted copy appended. This action is intended for resuming interrupted copy
8050 8050 operations. operations.
8051 8051
8052 - append all
8053 Append the current file, then try appending all other files. After this
8054 option has been selected non-regular files or directories still present a
8055 confirmation dialog. The intended use case is resuming an interrupted
8056 bulk copy without having to figure out which file got truncated.
8057
8052 8058 Notes: Notes:
8053 8059
8054 8060 - The conflict dialog appears for :put, p, P, al and rl commands. - The conflict dialog appears for :put, p, P, al and rl commands.
File data/vim/doc/app/vifm-app.txt changed (mode: 100644) (index ddcdf6402..8bae7f664)
... ... Available actions:
6786 6786 appended. This action is intended for resuming interrupted copy appended. This action is intended for resuming interrupted copy
6787 6787 operations. operations.
6788 6788
6789 - append all
6790 Append the current file, then try appending all other files. After this
6791 option has been selected non-regular files or directories still present a
6792 confirmation dialog. The intended use case is resuming an interrupted
6793 bulk copy without having to figure out which file got truncated.
6794
6789 6795 Notes: Notes:
6790 6796
6791 6797 - The conflict dialog appears for |vifm-:put|, |vifm-p|, |vifm-P|, - The conflict dialog appears for |vifm-:put|, |vifm-p|, |vifm-P|,
Hints

Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://code.reversed.top/user/xaizek/vifm

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@code.reversed.top/user/xaizek/vifm

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a pull request:
... clone the repository ...
... make some changes and some commits ...
git push origin master