Re: Logical bug during MERGE or REBASE
On 03/07/21 14.57, Atharva Raykar wrote:
Show 37 quoted lines
> Let's look at the diffs (I have annotated this with arrows):
>
> $ # common ancestor, ie, the first commit
> $ initial=$(git merge-base master dev)
>
> $ git diff $initial master
>
> diff --git a/program.cs b/program.cs
> index 8bc1a4d..93f872f 100644
> --- a/program.cs
> +++ b/program.cs
> @@ -1,4 +1,6 @@
> {
> Console.Writeline("1");
> + Console.Writeline("2");
> + Console.Readline();
> Console.Readline(); <--- X
> }
>
> $ git diff $initial dev
>
> diff --git a/program.cs b/program.cs
> index 8bc1a4d..eb91c97 100644
> --- a/program.cs
> +++ b/program.cs
> @@ -1,4 +1,6 @@
> {
> Console.Writeline("1");
> Console.Readline(); <--- X
> + Console.Readline();
> + Console.Readline();
> }
>
> As you can tell, on the master branch, Git sees the changes as
> "lines were added above the line labeled X",
> and on the dev branch, Git sees the changes as
> "lines were added below the line labeled X".What's the purpose of "X-labeled line" above?
--
An old man doll... just what I always wanted! - Clara
Bagas Sanjaya <bagasdotme@gmail.com>