3 ms·
> conflicts are stored in commits (so rebases always succeed) Is this pushed to the remote when running as a git porcelain?
by zamalek 4y ago
> conflicts are stored in commits (so rebases always succeed)
Is this pushed to the remote when running as a git porcelain?
- martinvonz 4y agoNo, 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.
- zamalek 4y agoAh that's a pity, but totally understandable.