{"id":18985264,"url":"https://github.com/dschrempf/syncthing-resolve-conflicts","last_synced_at":"2025-04-19T20:26:27.146Z","repository":{"id":55761320,"uuid":"82167909","full_name":"dschrempf/syncthing-resolve-conflicts","owner":"dschrempf","description":"A small bash script that handles synchronization conflicts with Syncthing.  Inspired by 'pacdiff' from Arch Linux.","archived":false,"fork":false,"pushed_at":"2025-04-10T09:41:32.000Z","size":37,"stargazers_count":93,"open_issues_count":0,"forks_count":14,"subscribers_count":8,"default_branch":"master","last_synced_at":"2025-04-10T10:50:00.582Z","etag":null,"topics":["conflict-resolution","syncthing"],"latest_commit_sha":null,"homepage":null,"language":"Shell","has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":"gpl-3.0","status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/dschrempf.png","metadata":{"files":{"readme":"README.md","changelog":null,"contributing":null,"funding":null,"license":"LICENSE","code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null,"governance":null,"roadmap":null,"authors":null,"dei":null,"publiccode":null,"codemeta":null}},"created_at":"2017-02-16T10:17:39.000Z","updated_at":"2025-04-10T09:40:33.000Z","dependencies_parsed_at":"2024-11-08T16:30:52.839Z","dependency_job_id":"189fcd5b-70d9-4600-803a-62b02194bd55","html_url":"https://github.com/dschrempf/syncthing-resolve-conflicts","commit_stats":null,"previous_names":[],"tags_count":0,"template":false,"template_full_name":null,"repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/dschrempf%2Fsyncthing-resolve-conflicts","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/dschrempf%2Fsyncthing-resolve-conflicts/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/dschrempf%2Fsyncthing-resolve-conflicts/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/dschrempf%2Fsyncthing-resolve-conflicts/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/dschrempf","download_url":"https://codeload.github.com/dschrempf/syncthing-resolve-conflicts/tar.gz/refs/heads/master","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":249250814,"owners_count":21237961,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2022-07-04T15:15:14.044Z","host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":["conflict-resolution","syncthing"],"created_at":"2024-11-08T16:25:22.074Z","updated_at":"2025-04-16T14:32:09.435Z","avatar_url":"https://github.com/dschrempf.png","language":"Shell","funding_links":[],"categories":[],"sub_categories":[],"readme":"# Resolve Syncthing synchronization conflicts\n\nA small Bash script that handles synchronization conflicts that necessarily pop\nup when using [Syncthing](https://syncthing.net/). Inspired by\n[`pacdiff`](https://wiki.archlinux.org/index.php/Pacman/Pacnew_and_Pacsave#Managing_.pacnew_files)\nfrom Arch Linux.\n\nBe careful with recursive conflicts of the form\n`.sync-conflict-XXXXXXXX-XXXXXX.sync-conflict-YYYYYYYY-YYYYYY` as they are not\ntreated in any special way at the moment.\n\nIn the following cases, conflicts will be ignored (i.e., not resolved), and\ninstead, consent is asked for removal:\n- files in `/.stversions/` folders;\n- non-text files.\n\n```console\n(C) + syncthing-resolve-conflicts -h\nsyncthing-resolve-conflicts v1.2.0\n\nInspired by 'pacdiff'. A simple program to merge or remove sync conflicts.\n'locate' (or 'find', see -f option) is used to find conflicts. In case the\ndatabase is not recent, run 'updatedb'.\n\nUsage: syncthing-resolve-conflicts [-d DIR] [-f] [-o] [--nocolor]\n\nGeneral Options:\n  -d/--directory DIR  only scan for sync conflicts in the directory DIR\n  -f/--find           use find instead of locate; by default, scan the home\n                      directory of the current user, but please see the -d\n                      option\n  -o/--output         print files instead of merging them\n  --nocolor           remove colors from output\n  -v/--version        print version and exit\n  -h/--help           print usage and exit\n\nEnvironment Variables:\n  DIFFPROG          override the merge program: (default: 'vim -d')\n\nExample: DIFFPROG=meld syncthing-resolve-conflicts\nExample: syncthing-resolve-conflicts --output\n```\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fdschrempf%2Fsyncthing-resolve-conflicts","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fdschrempf%2Fsyncthing-resolve-conflicts","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fdschrempf%2Fsyncthing-resolve-conflicts/lists"}