![]() ![]() ![]() As it turns out, syncthing can automatically keep an older copy of files This is where syncthing’s awesome versioning featureĬomes into play. “But where do we get the common ancestor from?”, you might ask. Using this, git can figure out whether lines missing in one of the versions wereĪctually added or removed - with only two files, this would be impossible ( See this stackoverflow post for a more thorough explanation). The common ancestor is the version that both conflicting versions are based on. Three files - the two conflicting edited versions, and their common ancestor. To work its magic, merge-file performs a “three-way merge”, where it looks at It automatically merges two versions of a file with little It’s bundled with git, but can run completely independent I tend to overlook these files, and resolving them using vimdiff or meld is time consuming. Syncthing doesn’t know how to combine the changes and creates aĪs a developer being used to git’s convenient merging, this bugged me a lot. ![]() that get changed on multiple devices before being synced, I’m relying more and more on syncthing to do that,Īnd today I would like to show you a simple trick that I think opens up a whole range ofįor files that don’t change often, syncthing is already quite nice, but for other files like Proprietary formats or servers that are not mine. I’m trying to move away from applications and services that store data using Recipes Automatically resolve Syncthing conflicts using a three-way merge September 17, 2020.Automatically resolve Syncthing conflicts using a three-way merge ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |