Duy Nguyen <pclouds@xxxxxxxxx> writes:
>> This conflicts with master because of your own 7e1eeaa431 ("completion:
>> use __gitcomp_builtin in _git_gc", 2018-02-09). I pushed out a
>> avar-pclouds/gc-auto-keep-base-pack branch to github.com/avar/git which
>> resolves it as:
>>
>> @@ -365,6 +393,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
>> OPT_BOOL_F(0, "force", &force,
>> N_("force running gc even if there may be another gc running"),
>> PARSE_OPT_NOCOMPLETE),
>> + OPT_BOOL(0, "keep-largest-pack", &keep_base_pack,
>> + N_("repack all other packs except the largest pack")),
>> OPT_END()
>> };
>>
>> I assume that's the intention here.
>
> Yeah, I want to keep the same base for easy interdiff. There are
> worse conflicts are with the other series I'm helping Stefan.
Right now there are a couple of topics that wants to touch options
array and also the builtins command table, which are both good
examples of "central registry" that everybody needs to touch and are
bound to become a source of conflict. Until I scream (and I try
hard not to have to), contributors should not have to worry too much
about causing conflicts---being traffic cop and directing orderly
integration of these topics is what the maintainer(s) do.
Thanks.
