Skip to content
This repository has been archived by the owner on Dec 15, 2022. It is now read-only.

Show the Git conflict GUI when sharing a conflicted file #247

Open
haacked opened this issue Nov 21, 2017 · 0 comments
Open

Show the Git conflict GUI when sharing a conflicted file #247

haacked opened this issue Nov 21, 2017 · 0 comments

Comments

@haacked
Copy link

haacked commented Nov 21, 2017

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.

image

Here's what the collaborator sees.

image

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.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

No branches or pull requests

2 participants