Y
Hacker News
new
|
ask
|
show
|
jobs
by
psd1
1396 days ago
Conflicts are not caused by git, they're caused by simultaneous edits. You'd have to solve that problem whatever your backend.