You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
This repository has been archived by the owner on Dec 15, 2022. It is now read-only.
I think a really common and useful scenario for Teletype is asking someone to help resolve a merge conflict. Merge conflicts can get really gnarly and pulling in the person who made the commit that your commit conflicts with is a neat way to work together to resolve it.
I tried this out in Teletype. Here's the conflicted file and the GUI I see.
Here's what the collaborator sees.
I understand that the Portal only shares the context of the file we're collaborating on. But it might not be too hard to send over a bit more context so that Atom knows to render the conflict GUI. That would make collaborating on this scenario a lot nicer.
The text was updated successfully, but these errors were encountered:
I think a really common and useful scenario for Teletype is asking someone to help resolve a merge conflict. Merge conflicts can get really gnarly and pulling in the person who made the commit that your commit conflicts with is a neat way to work together to resolve it.
I tried this out in Teletype. Here's the conflicted file and the GUI I see.
Here's what the collaborator sees.
I understand that the Portal only shares the context of the file we're collaborating on. But it might not be too hard to send over a bit more context so that Atom knows to render the conflict GUI. That would make collaborating on this scenario a lot nicer.
The text was updated successfully, but these errors were encountered: