[Owncloud] Suggestions

[iberlynx]

I stand corrected.

What about my suggestion of only locking locally within a couple of words of other user's editing?
And about using a duchain-like structure aware system?
And about block formatting changes that span over other users changes, giving those 3 choices?

On Thursday 15 July 2010 07:47:15 Jaroslaw Staniek wrote:
> On 15 July 2010 07:52, iberlynx <iberlynx at lavabit.com> wrote:
> > Sure, I'm not saying git is imperative, although git IIRC merges all kinds of text, not just code, and office (XML) files are just text wright?
> 
> Wrong, see the simple example:
> 
> +<foo a="1" b="2"/>
> -<foo b="2" a="1" />
> 
> This patch is empty in terms of XML. But not for git.
> 
> > And is pretty fast.
> It's fast for large number of files. It's irrelevant since it's text only.
> 
> > But still i think git is wright in not merging within the same line, because if two people do opposing changes in the same line, we've got a problem.
> 
> There can be single XML line that is rendered as many lines on screen.
> There can be many XML lines that are rendered as a tiny single-line chunk.
> 
>