Andy Parkins <andyparkins@gmail.com> writes:

quoted text
> On Tuesday 2007, April 10, Linus Torvalds wrote:
>
>> (But there's nothing that says that the ".gitmodules" file couldn't
>> just use the same parser as the git config file, so I don't really
>> strongly care either way. I just think it would be nice to be able to
>> say
>>
>> 	[module "kdelibs"]
>> 		dir = kdelibs
>> 		url = git://git.kde.org/kdelibs
>> 		description = "Basic KDE libraries module"
>>
>> 	[module "base"]
>> 		alias = "kdelibs", "kdebase", "kdenetwork"
>>
>> or whatever. You get the idea..)
>
> Would it be nicer if .gitmodules were line-based to aid in merging?

I personally feel that if there are cases that merge conflict is
hard to resolve, there is something wrong in the communication
between project members.  In other words, merging this *should*
be hard.

Really, if somebody wants to have project X at directory sub/X/
and somebody else wants the same at directory X/, merging the
modules file would be the least of your concern -- resulting
toplevel would not build correctly until you decide which tree
hierarchy should be picked, and later exchange of results among
project members would not be usable easily to half the people
who picked the hierarchy differently from you did.


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html