{"thread":{"id":"41982","subject":"A small Git bug","startedAt":"2016-04-10T15:17:29Z","lastAt":"2016-04-10T17:34:34Z","messageCount":3,"participants":["Victor Porton","Karthik Nayak","Philip Oakley"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"283099","messageId":"1460301449.7971.4.camel@narod.ru","threadId":"41982","inReplyTo":null,"subject":"A small Git bug","fromName":"Victor Porton","fromEmail":"porton@narod.ru","sentAt":"2016-04-10T15:17:29Z","receivedAt":"2016-04-10T15:17:29Z","isPatch":false,"sender":{"key":"porton@narod.ru","avatar":"https://gravatar.com/avatar/26fbbd66c3da4108798dc4fccb153ea484585216cc8f62e678c07a05e8dcd165?d=mp&s=160"},"body":"I have three branches: master, prerelease, and devel.\n\nSuppose now we are in master.\n\nI often run the following command (in fact it is an alias, to save\ntyping):\n\ngit push && git checkout prerelease && git merge master && git push &&\ngit checkout devel && git merge prerelease && git push && git checkout\nmaster\n\nThere is a small problem: After running this command my text editor\nproposes me to reload changed files.\n\nSo, it seems that the above command marks some files as changed. It is\nwrong, because it is inconvenient a little to reload a file or two\nevery time after I submit the changes.\n"},{"id":"283101","messageId":"CAOLa=ZTJydx5iXVRz0nxrQM0RgzN-xgTO-6KUjVDck5ApXe1Pw@mail.gmail.com","threadId":"41982","inReplyTo":"1460301449.7971.4.camel@narod.ru","subject":"Re: A small Git bug","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2016-04-10T16:01:57Z","receivedAt":"2016-04-10T16:01:57Z","isPatch":false,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Hello,\n\nOn Sun, Apr 10, 2016 at 8:47 PM, Victor Porton <porton@narod.ru> wrote:\n> I have three branches: master, prerelease, and devel.\n>\n> Suppose now we are in master.\n>\n> I often run the following command (in fact it is an alias, to save\n> typing):\n>\n> git push && git checkout prerelease && git merge master && git push &&\n> git checkout devel && git merge prerelease && git push && git checkout\n> master\n>\n> There is a small problem: After running this command my text editor\n> proposes me to reload changed files.\n>\n> So, it seems that the above command marks some files as changed. It is\n> wrong, because it is inconvenient a little to reload a file or two\n> every time after I submit the changes.\n\nIts more of intentional behavior than a bug. When you merge branches, the\ntimestamp of the files involved are updated to reflect the merge.\n\nYour text editor seems to have picked up this change in the file's timestamp as\nchanges made to the content of the file.\n\n-- \nRegards,\nKarthik Nayak\n"},{"id":"283104","messageId":"6809717A50B04A2482A4F37492363698@PhilipOakley","threadId":"41982","inReplyTo":"CAOLa=ZTJydx5iXVRz0nxrQM0RgzN-xgTO-6KUjVDck5ApXe1Pw@mail.gmail.com","subject":"Re: A small Git bug","fromName":"Philip Oakley","fromEmail":"philipoakley@iee.org","sentAt":"2016-04-10T17:34:34Z","receivedAt":"2016-04-10T17:34:34Z","isPatch":false,"sender":{"key":"philipoakley@iee.email","avatar":"https://avatars.githubusercontent.com/u/914343?v=4"},"body":"From: \"Karthik Nayak\" <karthik.188@gmail.com>\n> Hello,\n>\n> On Sun, Apr 10, 2016 at 8:47 PM, Victor Porton <porton@narod.ru> wrote:\n>> I have three branches: master, prerelease, and devel.\n>>\n>> Suppose now we are in master.\n>>\n>> I often run the following command (in fact it is an alias, to save\n>> typing):\n>>\n>> git push && git checkout prerelease && git merge master && git push &&\n>> git checkout devel && git merge prerelease && git push && git checkout\n>> master\n>>\n>> There is a small problem: After running this command my text editor\n>> proposes me to reload changed files.\n>>\n>> So, it seems that the above command marks some files as changed. It is\n>> wrong, because it is inconvenient a little to reload a file or two\n>> every time after I submit the changes.\n>\n> Its more of intentional behavior than a bug. When you merge branches, the\n> timestamp of the files involved are updated to reflect the merge.\n>\n> Your text editor seems to have picked up this change in the file's \n> timestamp as\n> changes made to the content of the file.\n>\nVictor,\nThere is also a patch series in discussion [1] about doing these conflict \nfree (hopefully) merges without the use of the worktree. This would allow \nyou workflow to be re-coded so that the checkout dance never occurs and \nmaster is undisturbed, removing the editor's change logic from the problem.\n\n[1] http://thread.gmane.org/gmane.comp.version-control.git/291007\n--\n\nPhilip \n"}]}