Jed Carty wrote:
>
> Magically taking care of conflicts is going to be the big sticking point.
>

But not if the repo owner handles it right? (Just so I don't misunderstand).
Does gh otherwise have a 'conflict handler' or does it fully rely on manual 
handling for this?

We may be able to do something like you are describing that lets you see 
> the conflicts and handle them manually with a reasonable interface, but 
> that is a very significant project by itself.
>

Yes, but it would open up a LOT of possibilities for the community and also 
outside of it.

<:-)

-- 
You received this message because you are subscribed to the Google Groups 
"TiddlyWikiDev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/tiddlywikidev/0e0d0e9a-b329-43ec-8948-e41dccefd7d9o%40googlegroups.com.

Reply via email to