# Sync conflicts and master folder

**URL:** https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936
**Category:** Support
**Created:** [June 3, 2015, 1:32pm UTC](https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936 "2015-06-03T13:32:24Z")
**Posts on this page:** 16
**Page:** 1

<div class="post-metadata">

### Author: ![Eddy2909](https://forum.syncthing.net/user_avatar/forum.syncthing.net/eddy2909/32/2011_2.png) [@Eddy2909](https://forum.syncthing.net/u/Eddy2909)
#### Post date: [June 3, 2015, 1:32pm UTC](https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936/1 "2015-06-03T13:32:24Z")

</div>

hi guys… as I told, I’m syncing my mp3 files with two devices. The first "main-"device is where I got the most and up-to-date files. The second is my Laptop and the third is my cloud vserver (as fallback if I’m en route with my laptop)

for the first run I added on my first device the folder as a master folder to sync to the cloud. all files from the main device were copied to the laptop manually. Running only the main and the laptop device to sync they are producing lots of sync-conflicts and I don’t know why. 😳First question: In my case: How are these conflicts are produced? (Were the files on the laptop newer than the ones on my main device?)

Second question: As I understand the “override option” right, the main master folder pushes all changes to the others right? When I’m watching the files to “override”, the arrows pointing down as if the files of my laptop will be downloaded on the main device - hopefully I am wrong 😞

third question: what happens if I’ll deactivate master folder on the main device?

thanks!

---

<div class="post-metadata">

### Author: ![calmh](https://forum.syncthing.net/user_avatar/forum.syncthing.net/calmh/32/15311_2.png) [@calmh](https://forum.syncthing.net/u/calmh)
#### Post date: [June 3, 2015, 1:52pm UTC](https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936/2 "2015-06-03T13:52:47Z")

</div>

> [@Eddy2909](#):
>
> Running only the main and the laptop device to sync they are producing lots of sync-conflicts and I don’t know why.

If you mean an actual `whateverfilename-sync-conflict-20150603-...ext` file then the contents were different on the two sides when Syncthing did the initial sync of the two devices.

> [@Eddy2909](#):
>
> As I understand the “override option” right, the main master folder pushes all changes to the others right? When I’m watching the files to “override”, the arrows pointing down as if the files of my laptop will be downloaded on the main device - hopefully I am wrong disappointed

Yes. “Override” makes whatever the master has become the latest version for everyone else.

> [@Eddy2909](#):
>
> what happens if I’ll deactivate master folder on the main device?

Then it becomes a normal, non-master device… If files are changed on other devices, those changes are synced to this device as well.

---

<div class="post-metadata">

### Author: ![Eddy2909](https://forum.syncthing.net/user_avatar/forum.syncthing.net/eddy2909/32/2011_2.png) [@Eddy2909](https://forum.syncthing.net/u/Eddy2909)
#### Post date: [June 3, 2015, 1:58pm UTC](https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936/3 "2015-06-03T13:58:54Z")

</div>

> [@calmh](#):
>
> If you mean an actual whateverfilename-sync-conflict-20150603-…ext file then the contents were different on the two sides when Syncthing did the initial sync of the two devices.

isnt syncthing changing the files on the slave then?

---

<div class="post-metadata">

### Author: ![calmh](https://forum.syncthing.net/user_avatar/forum.syncthing.net/calmh/32/15311_2.png) [@calmh](https://forum.syncthing.net/u/calmh)
#### Post date: [June 3, 2015, 2:00pm UTC](https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936/4 "2015-06-03T14:00:06Z")

</div>

A change detected on the master will be synced to the slave, yes. But in this case it sounds like you had differing contents to start with, i.e. at the initial scan.

---

<div class="post-metadata">

### Author: ![Eddy2909](https://forum.syncthing.net/user_avatar/forum.syncthing.net/eddy2909/32/2011_2.png) [@Eddy2909](https://forum.syncthing.net/u/Eddy2909)
#### Post date: [June 3, 2015, 2:06pm UTC](https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936/5 "2015-06-03T14:06:04Z")

</div>

ah ok… thanks! so I’ll start over to copy the files from my main to the laptop right? 😳after that it should not run “out of sync”…

---

<div class="post-metadata">

### Author: ![calmh](https://forum.syncthing.net/user_avatar/forum.syncthing.net/calmh/32/15311_2.png) [@calmh](https://forum.syncthing.net/u/calmh)
#### Post date: [June 3, 2015, 2:06pm UTC](https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936/6 "2015-06-03T14:06:55Z")

</div>

Or just hit override on the master, and remove any sync conflicts on the slave, and you’re good to go.

---

<div class="post-metadata">

### Author: ![Eddy2909](https://forum.syncthing.net/user_avatar/forum.syncthing.net/eddy2909/32/2011_2.png) [@Eddy2909](https://forum.syncthing.net/u/Eddy2909)
#### Post date: [June 3, 2015, 2:08pm UTC](https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936/7 "2015-06-03T14:08:35Z")

</div>

but the button appears oooooften 😳 once with 1 file, once with 15 files and so on…

this means all deleted sync coflicts will be downloaded once again because they’re existing twice??

---

<div class="post-metadata">

### Author: ![calmh](https://forum.syncthing.net/user_avatar/forum.syncthing.net/calmh/32/15311_2.png) [@calmh](https://forum.syncthing.net/u/calmh)
#### Post date: [June 3, 2015, 2:15pm UTC](https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936/8 "2015-06-03T14:15:02Z")

</div>

I don’t understand what you mean at this point. There’s only one such button…

---

<div class="post-metadata">

### Author: ![Eddy2909](https://forum.syncthing.net/user_avatar/forum.syncthing.net/eddy2909/32/2011_2.png) [@Eddy2909](https://forum.syncthing.net/u/Eddy2909)
#### Post date: [June 3, 2015, 2:15pm UTC](https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936/9 "2015-06-03T14:15:53Z")

</div>

if I’m manually deleting the sync-conflict files, will they be downloaded from master again?

---

<div class="post-metadata">

### Author: ![uok](https://forum.syncthing.net/letter_avatar_proxy/v4/letter/u/e99b99/32.png) [@uok](https://forum.syncthing.net/u/uok)
#### Post date: [June 3, 2015, 2:34pm UTC](https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936/10 "2015-06-03T14:34:57Z")

</div>

I noticed the same problem: sync conflicts with folder master but the destination files are never changed so there should not be any conflict. My guess is some sort of race condition on slow connections?

Also not good on slow connections is that the pieces of the conflict files are not used for other transfers - would this be possible? Right now a 2GB outlook pst file “original.pst” is renamed to “conflict.pst” on the destination. Then on next scan (or manual override) the whole 2GB “original.pst” has to be transferred even if only 1 byte has changed in “conflict.pst”

---

<div class="post-metadata">

### Author: ![AudriusButkevicius](https://forum.syncthing.net/user_avatar/forum.syncthing.net/audriusbutkevicius/32/277_2.png) [@AudriusButkevicius](https://forum.syncthing.net/u/AudriusButkevicius)
#### Post date: [June 3, 2015, 3:04pm UTC](https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936/11 "2015-06-03T15:04:33Z")

</div>

I think you should raise an issue for this, we should index the conflict file at the point we move it out for conflict to avoid this behaviour.

---

<div class="post-metadata">

### Author: ![Eddy2909](https://forum.syncthing.net/user_avatar/forum.syncthing.net/eddy2909/32/2011_2.png) [@Eddy2909](https://forum.syncthing.net/u/Eddy2909)
#### Post date: [June 3, 2015, 3:33pm UTC](https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936/12 "2015-06-03T15:33:55Z")

</div>

so: what happens if I’ll delete the sync-conflict files on my slave cloud server? will they be downloaded again?

And what will happen, if I deactivate the master option?

---

<div class="post-metadata">

### Author: ![AudriusButkevicius](https://forum.syncthing.net/user_avatar/forum.syncthing.net/audriusbutkevicius/32/277_2.png) [@AudriusButkevicius](https://forum.syncthing.net/u/AudriusButkevicius)
#### Post date: [June 3, 2015, 3:46pm UTC](https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936/13 "2015-06-03T15:46:33Z")

</div>

Yes, they will be downloaded again at the point the master overrides changes. If you deactivate the master option, then the deletion should eventually propagate to the ex-master.

---

<div class="post-metadata">

### Author: ![calmh](https://forum.syncthing.net/user_avatar/forum.syncthing.net/calmh/32/15311_2.png) [@calmh](https://forum.syncthing.net/u/calmh)
#### Post date: [June 3, 2015, 5:11pm UTC](https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936/14 "2015-06-03T17:11:22Z")

</div>

But if they don’t exist on the master, and you hit override on the master, then they will be removed from the slave as well…

---

<div class="post-metadata">

### Author: ![Eddy2909](https://forum.syncthing.net/user_avatar/forum.syncthing.net/eddy2909/32/2011_2.png) [@Eddy2909](https://forum.syncthing.net/u/Eddy2909)
#### Post date: [June 4, 2015, 9:15am UTC](https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936/15 "2015-06-04T09:15:33Z")

</div>

thanks guys

##closed##

---

<div class="post-metadata">

### Author: ![system](https://forum-uploads.syncthingcdn.net/original/2X/0/0b50e0a202b22ae6a67190759e8c868805b8ed9f.png) [@system](https://forum.syncthing.net/u/system)
#### Post date: [May 12, 2017, 12:58pm UTC](https://forum.syncthing.net/t/sync-conflicts-and-master-folder/2936/16 "2017-05-12T12:58:49Z")

</div>


