Re: A small Git bug

From: Karthik Nayak <karthik.188@gmail.com>
Date: Apr 10, 2016, 16:01 UTC
Message-ID: <CAOLa=ZTJydx5iXVRz0nxrQM0RgzN-xgTO-6KUjVDck5ApXe1Pw@mail.gmail.com>
In-Reply-To: <1460301449.7971.4.camel@narod.ru>

Hello,

On Sun, Apr 10, 2016 at 8:47 PM, Victor Porton <porton@narod.ru> wrote:

Show 17 quoted lines

> I have three branches: master, prerelease, and devel.
>
> Suppose now we are in master.
>
> I often run the following command (in fact it is an alias, to save
> typing):
>
> git push && git checkout prerelease && git merge master && git push &&
> git checkout devel && git merge prerelease && git push && git checkout
> master
>
> There is a small problem: After running this command my text editor
> proposes me to reload changed files.
>
> So, it seems that the above command marks some files as changed. It is
> wrong, because it is inconvenient a little to reload a file or two
> every time after I submit the changes.

Its more of intentional behavior than a bug. When you merge branches, the timestamp of the files involved are updated to reflect the merge.

Your text editor seems to have picked up this change in the file's timestamp as changes made to the content of the file.

-- 
Regards,
Karthik Nayak