I’m trying to wrap my head around how merge conflicts work over a shared drive an am hoping that the community can help.
Let’s say I have a drive sitting on computer A that I share with computer B via simple SSH. This drive contains one file. Now let’s say I take both computers offline. I make some modifications to the local copy of the file on computer A and different modifications to the copy on computer B. I then reconnect the two computers.
What happens at this point? Do the modifications on one override the other? Do they merge somehow? If I delete the file on one computer but modify it on on the other before putting the computers back online, what happens then?
Thanks in advance for your help?
