Re: A small Git bug

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello,

On Sun, Apr 10, 2016 at 8:47 PM, Victor Porton <porton@xxxxxxxx> wrote:
> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]