Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

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.


Ah that's a pity, but totally understandable.




Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: