Re: [PATCH v6 10/13] merge: use the "resolve" strategy without forking
- From
Derrick Stolee <stolee@gmail.com>
- Date
- Jan 5, 2021, 16:45 UTC
- Message-ID
- <8a0ce635-261d-3099-dc10-eabd7d41332f@gmail.com>
- In-Reply-To
- <20201124115315.13311-11-alban.gruin@gmail.com>
On 11/24/2020 6:53 AM, Alban Gruin wrote:
> This teaches `git merge' to invoke the "resolve" strategy with a > function call instead of forking.
...
Show 11 quoted lines
> @@ -740,6 +741,9 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
> COMMIT_LOCK | SKIP_IF_UNCHANGED))
> die(_("unable to write %s"), get_index_file());
> return clean ? 0 : 1;
> + } else if (!strcmp(strategy, "resolve")) {
> + return merge_strategies_resolve(the_repository, common,
> + head_arg, remoteheads);
> } else {
> return try_merge_command(the_repository,
> strategy, xopts_nr, xopts,
> This is a very satisfying change.
Thanks, -Stolee