{"thread":{"id":"15191","subject":"new file missing after resolving rebase merge conflict","startedAt":"2008-08-24T17:20:50Z","lastAt":"2008-08-24T17:20:50Z","messageCount":1,"participants":["Benny Halevy"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"88365","messageId":"48B19872.9070707@panasas.com","threadId":"15191","inReplyTo":null,"subject":"new file missing after resolving rebase merge conflict","fromName":"Benny Halevy","fromEmail":"bhalevy@panasas.com","sentAt":"2008-08-24T17:20:50Z","receivedAt":"2008-08-24T17:20:50Z","isPatch":false,"sender":{"key":"bhalevy@panasas.com","avatar":null},"body":"with git version 1.6.0\n\nWhen rebasing a branch onto another\n(command was git rebase --onto newbase newbase.orig branch)\nI've hit a merge conflict in one of the patches that\namong other things, adds some new files to the tree.\nAfter resolving the conflict and running git add on the\nresolved files I ran git rebase --continue and in a later\npatch, when trying to compile I noticed that one of the files\nthat the former patch was supposed to add is missing from the\ntree and from the index.\n\nI'm not sure it's relevant, yet this file is the last hunk in\nthe patch.\n\nAnyhow, the file still appears with git show of the rebased\npatch:\n\n$ git show 39fe203\n...\ndiff --git a/include/linux/pnfs_xdr.h b/include/linux/pnfs_xdr.h\nnew file mode 100644\nindex 0000000..1f811c5\n--- /dev/null\n+++ b/include/linux/pnfs_xdr.h\n@@ -0,0 +1,137 @@\n\nbut it doesn't appear to exist in the index:\n\n$ git checkout include/linux/pnfs_xdr.h\nerror: pathspec 'include/linux/pnfs_xdr.h' did not match any file(s) known to git.\n\nonly after explicitly re-checking it out from the former patch:\n$ git checkout 39fe203 -- include/linux/pnfs_xdr.h\n\nit comes to existence.\n\nBenny\n"}]}