From: Philip Oakley Date: Sun, 10 Apr 2016 17:34:34 GMT Subject: Re: A small Git bug Message-ID: <6809717A50B04A2482A4F37492363698@PhilipOakley> In-Reply-To: From: "Karthik Nayak" > Hello, > > On Sun, Apr 10, 2016 at 8:47 PM, Victor Porton 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. > Victor, There is also a patch series in discussion [1] about doing these conflict free (hopefully) merges without the use of the worktree. This would allow you workflow to be re-coded so that the checkout dance never occurs and master is undisturbed, removing the editor's change logic from the problem. [1] http://thread.gmane.org/gmane.comp.version-control.git/291007 -- Philip