[Owncloud] Suggestions

[Cyrille Berger]

On Thursday 15 July 2010, iberlynx wrote:
> 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. Maybe the solution lies with the standard highlighting the line
> that the other user is editing, which is already an intuitive visual
> deterrent for editing that line, combined with the locking of only that
> highlighted line. So if the user for example tries to change formatting of
> a whole paragraph which contains said highlighted line (other user is
> editing), the interface just flashes and gives out some kind of warning
> that you can't edit the same line other users are editing remotely, and
> asks: do you wish to 1. don't apply formatting, 2. apply formatting to the
> rest of the lines, 3. suggest the other user to apply formatting to the
> whole block?
What you describe here is within the pessimistic approach.



Also in XML, order of attributes as well as space or return carriage does not 
have meaning, so the following files are the same:

file1
<a v1=1 v2=2><b v3=0>Hello world<br/></b></a>

file2
<a v2=2 v1=1 >
<b v3=0>Hello world<br/></b></a>

file3
<a v2=2 v1=1 >
<b v3=0>Hello world<br/></b>
</a>

file4
    <a v2=2 v1=1 >
<b v3=0>Hello world<br/>


</b>
</a>

Which would cause problem using git, two different versions of the same 
applications would save the exact same file differently (even slightly), not 
counting if in the long term we would want to have a protocol that is shared 
with different application (OOo, KOffice, Abiword, ...).

For that reason, I am very sceptical for the use of git (or any revision 
control system) with generated files for collaborative work, which is confirmed 
by experience with the .ui files generated by Qt designer, two persons editing 
a ui file at the same time, usually end up in a conflict very difficult to merge.

-- 
Cyrille Berger