Re: Logical bug during MERGE or REBASE

From: Atharva Raykar <raykar.ath@gmail.com>
Date: Jul 4, 2021, 06:30 UTC
Message-ID: <928F285A-4F5B-48BA-A817-EE809FD16E16@gmail.com>
In-Reply-To: <3f09d890-e9b7-0e54-0d03-2ed7609cb448@gmail.com>

On 04-Jul-2021, at 11:42, Bagas Sanjaya <bagasdotme@gmail.com> wrote:

Show 35 quoted lines

> 
> On 03/07/21 14.57, Atharva Raykar wrote:
>> 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?

It was just something I manually annotated on the output to keep a track of which 'Console.Readline()' line I was referring to.

It is less tedious for to say "line labeled X" than, "the second line in the code block in the initial commit".

If it has made my explanation a little unclear, I don't mind having a second attempt at it :)