Re: [PATCH 3/6] This file wasn't supposed to change during my git push for check-ref-format :(

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 7, 2019, 10:23 UTC
Message-ID: <xmqqo8xoouht.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <078a19e86af6fcf1348d8988dc10cfac2e689ba4.1573114201.git.gitgitgadget@gmail.com>

"george espinoza via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: george espinoza <gespinoz2019@gmail.com>
>
> Signed-off-by: george espinoza <gespinoz2019@gmail.com>
> ---

While developing your first patch, it is expected that you make mistake in an earlier step (e.g. 2/6) and then later realize it and want to fix, like this one. Instead of going back to the earlier mistake and fixing it right there before building more on top, tentatively fixing with "oops that was wrong" like this one and building further (i.e. 4 and later steps) is an expedient way.

But once you are done, you need to get your act together before presenting the resulting series to the general public.

Please learn to use "rebase -i" to clean up the series before asking GGG to publish it to the list.

Thanks.

Show 19 quoted lines

>  builtin/merge-ours.c | 5 -----
>  1 file changed, 5 deletions(-)
>
> diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c
> index 3980f4899a..4594507420 100644
> --- a/builtin/merge-ours.c
> +++ b/builtin/merge-ours.c
> @@ -11,11 +11,6 @@
>  #include "git-compat-util.h"
>  #include "builtin.h"
>  #include "diff.h"
> -#include "parse-options.h"
> -
> -/* parse-options.h added to initiate replacement of manual option parsing
> - * with parse-options. 
> - */
>  
>  static const char builtin_merge_ours_usage[] =
>  	"git merge-ours <base>... -- HEAD <remote>...";