Unique names for conflict files

[wonder-sk]

If there is a conflict in local and server version of a file XYZ, upon pull the python client will create XYZ_conflict_copy file with local content and XYZ file will contain server content. It would be good to use a better naming pattern so that:

• we know which was the base version of the local copy (this can be currently found out only from client's sync log file)
• we know which user created the conflict (this can be figured out from project history, but would be nicer if we can find out from filename)

For example the template could be XYZ-conflict-[username]-[base_version]

I am wondering whether to add also few unique characters at the end - to make sure that there won't be any name clashes...?

[wonder-sk]

Naming scheme adopted by Input recently (MerginMaps/mobile#1878):

• my data (conflicted copy, martin v10).gpkg - for full copy (when rebase fails)
• my data (edit conflict, martin v10).json - for list of edit conflicts upon rebase (always a JSON file)

And when generating unique file name, e.g. filename.txt and it already exists, we continue with

• filename (1).txt
• filename (2).txt
• ...