{"thread":{"id":"38641","subject":"[bug?] renamed file loses changes in merge.","startedAt":"2015-02-24T15:33:42Z","lastAt":"2015-02-24T15:33:42Z","messageCount":1,"participants":["Mauro Condarelli"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"256578","messageId":"54EC99D6.9010307@mclink.it","threadId":"38641","inReplyTo":null,"subject":"[bug?] renamed file loses changes in merge.","fromName":"Mauro Condarelli","fromEmail":"mc5686@mclink.it","sentAt":"2015-02-24T15:33:42Z","receivedAt":"2015-02-24T15:33:42Z","isPatch":false,"sender":{"key":"mc5686@mclink.it","avatar":null},"body":"I'm unsure it is a bug or a misuse on my part, but:\n\nSituation:\n\nThere are two distinct repositories (upstream & local), local is a fork of upstream (at tag \"v3.7\").\nBoth repositories were modified (upstream has delivered new version with tag \"v3.7.1\").\nI need to incorporate local changes into the new upstream release.\n\nI did the following:\n\ngit clone upstream\ngit checkout v3.7.1 -b v3.7.1_local                       (I do not want anything later than that)\ngit remote add local ../local/.git\ngit fetch local\ngit merge local/current\n... resolve conflicts ...\ngit ad --all\ngit commit -m ...\n\nAt this point I discovered that one specific file:\nwas renamed in upstream\nwas changed in local\n\nWhat I have on my workspace is the *renamed* file *without* the modifications from local.\n\nIs this the normal behavior?\nIf so I fail to understand the rationale behind it; I would expect git to apply changes to the renamed file.\n\nThanks in Advance\nMauro\n"}]}