search

multihack / multihack-brackets

Realtime collaboration for programmers. (Brackets Extension)
MIT License
24 stars 9 forks source link

Duplicating files #43

Open siphomateke opened 7 years ago

siphomateke commented 7 years ago

Issue After hosting from computer1 with some files, connecting to multihack-server from computer2, which doesn't have any files, computer1 will receive the files (it already has) again duplicating everything within them. So if it has one line, after syncing it will have the same line again below the first.

Steps to reproduce

  1. start a multihack-server
  2. create files on computer1 and join a room
  3. open an empty folder on computer2
  4. connect to the same room as computer1 from computer2

Expected result The files sync successfully onto computer2 but not onto computer1 since it is the one providing them. computer1 should not experience any changes to it's files after syncing.

t-mullen commented 7 years ago

This is another example of merge conflicts when there are different versions being synced.

t-mullen commented 7 years ago

That does seem different from what normally happens though, I think this is related to your other issue.

t-mullen commented 7 years ago

Some events were leaking through as changes. Fixed next version.

t-mullen commented 7 years ago

Fixed in 4.2.0