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 645336fc6a108100139d185f765998a41821cfc2

Use "a" for append option on conflicts
Author: xaizek
Author date (UTC): 2014-10-07 20:34
Committer name: xaizek
Committer date (UTC): 2014-10-07 20:34
Parent(s): 42d0b345f8def6e3b1f429c1a6a27f663e7d7d37
Signing key:
Tree: 8a01d5d6e1f72c74402d4fa95f69c37967979305
File Lines added Lines deleted
ChangeLog 1 1
src/fileops.c 3 3
File ChangeLog changed (mode: 100644) (index 0a8ca93ad..4c6120a50)
58 58 to the given value (alike "/pattern" and "filter value"). Thanks to to the given value (alike "/pattern" and "filter value"). Thanks to
59 59 filterfalse. filterfalse.
60 60
61 Added "a[p]pend the end" conflict resolution option (appends the rest of
61 Added "[a]ppend the end" conflict resolution option (appends the rest of
62 62 file, e.g. if previous operation was terminated). Available only if file, e.g. if previous operation was terminated). Available only if
63 63 'syscalls' option is set. Thanks to Sergei Shilovsky. 'syscalls' option is set. Thanks to Sergei Shilovsky.
64 64
File src/fileops.c changed (mode: 100644) (index 38c785c6e..dc1d789e4)
... ... prompt_what_to_do(const char src_name[])
1741 1741
1742 1742 (void)replace_string(&put_confirm.name, src_name); (void)replace_string(&put_confirm.name, src_name);
1743 1743 vifm_swprintf(buf, ARRAY_LEN(buf), L"Name conflict for %" WPRINTF_MBSTR vifm_swprintf(buf, ARRAY_LEN(buf), L"Name conflict for %" WPRINTF_MBSTR
1744 L". [r]ename/[s]kip/[o]verwrite%" WPRINTF_MBSTR
1745 "/[O]verwrite all%" WPRINTF_MBSTR "%" WPRINTF_MBSTR ": ",
1744 L". [r]ename/[s]kip%" WPRINTF_MBSTR "/[o]verwrite/[O]verwrite all"
1745 "%" WPRINTF_MBSTR ": ",
1746 1746 src_name, src_name,
1747 (cfg.use_system_calls && !is_dir(src_name)) ? "/a[p]pend the end" : "",
1747 (cfg.use_system_calls && !is_dir(src_name)) ? "/[a]ppend the end" : "",
1748 1748 put_confirm.allow_merge ? "/[m]erge" : "", put_confirm.allow_merge ? "/[m]erge" : "",
1749 1749 put_confirm.allow_merge ? "/[M]erge all" : ""); put_confirm.allow_merge ? "/[M]erge all" : "");
1750 1750 enter_prompt_mode(buf, "", put_decide_cb, NULL, 0); enter_prompt_mode(buf, "", put_decide_cb, NULL, 0);
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