Skip to content
Better HN
Top
Best
Ask
Show
New
Jobs
Search
⌘K
0 points
martinvonz
3y ago
0 comments
Save
Share
No, the CLI prevents that because the remote is unlikely to know how to interpret conflicts. In a future where the remote understands conflicts, then you'll be able to push conflicts to a remote and collaborate on the conflict resolution.
0 comments
1 comments · 1 top-level
top
newest
oldest
zamalek
3y ago
Ah that's a pity, but totally understandable.
j
/
k
navigate · click thread line to collapse