{"thread":{"id":"24947","subject":"Merging topic branches -- changed file locations.","startedAt":"2010-09-02T09:51:49Z","lastAt":"2010-09-02T09:51:49Z","messageCount":1,"participants":["Thomas Adam"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"149634","messageId":"AANLkTim_UkTMJdZCBpzGrXvo2L2uzL5H4QY2aYaLZw-3@mail.gmail.com","threadId":"24947","inReplyTo":null,"subject":"Merging topic branches -- changed file locations.","fromName":"Thomas Adam","fromEmail":"thomas@xteddy.org","sentAt":"2010-09-02T09:51:49Z","receivedAt":"2010-09-02T09:51:49Z","isPatch":false,"sender":{"key":"thomas@xteddy.org","avatar":"https://gravatar.com/avatar/e7256db4738e501e5d2e84f00bb0bd99503165729573848a03330301fc2adc4a?d=mp&s=160"},"body":"Hello all,\n\nI'm wondering what people do in the following situation, involving\nintegration branches, topic branches, and directory renames.\n\nWe use a workflow, whereby people develop features in local topic\nbranches, and then merge them into designate integration branches.  So\nfor instance, given a public integration branch:\n\nintegration/foo\n\nand a local topic branch of:\n\ntopic/foo\n\nThat topic/foo branch would get merged into integration/foo with:\n\ngit merge --no-ff integration/foo\n\n... and the result pushed out.\n\nThis is working just fine -- except that recently, we had cause to\n\"git mv\" a directory -- the result of which has been merged and pushed\nout on \"integration/foo\".  So for example, throughout the lifetime of\n\"integration/foo\", there has been a directory called:\n\nmodules/foo\n\nWhich has been renamed to:\n\nmodules/foo2\n\nThat's fine.  But now, we've run into a problem, whereby people have\nlocal topic branches with outstanding changes on them that need\nmerging to integration/foo.  But the commits on these topic branches\nstill have references to \"modules/foo\", which makes merging them in to\nthe integration/foo branch almost impossible.\n\nWhat's the best way of solving this?  I blindly tested this, by doing\na \"git mv modules/foo modules/foo2\" on \"topic/foo\" and trying to then\nmerge the result of that to integration/foo -- but that didn't work\nvery well either.\n\nAny insight would be greatly appreciated.  I hope my ramblings make sense.\n\nKindly,\n\n-- Thomas Adam\n"}]}