This script searches a local folder for sync conflicts caused by Nextcloud or Syncthing and asks how to resolve each of these. In the case of plain text files (based on a .txt, .md or .json file extension) it prints the difference. If you have a merge tool set up for git, it also gives the option to use that to solve the conflict.

• Run pipenv install to install all dependencies from the Pipfile
• Run pipenv run python solve-conflicts.py to solve your conflicts
• Feel free to change the defaults at the top of solve-conflicts.py to match your system

• Based on iagopinal's nextcloud_solve_conflicts
• Uses pipenv for the virtual environment;
• inquirer for the prompts;
• colorama for colored diffs;
• pathlib for file path operations;
• and datetime to display file modification times in a readable format