{"thread":{"id":"25768","subject":"How to apply patches","startedAt":"2010-11-17T10:00:42Z","lastAt":"2010-11-17T15:01:16Z","messageCount":3,"participants":["Ananth","Tay Ray Chuan"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"156040","messageId":"1289988042359-5747036.post@n2.nabble.com","threadId":"25768","inReplyTo":null,"subject":"How to apply patches","fromName":"Ananth","fromEmail":"smilewithani@gmail.com","sentAt":"2010-11-17T10:00:42Z","receivedAt":"2010-11-17T10:00:42Z","isPatch":false,"sender":{"key":"smilewithani@gmail.com","avatar":null},"body":"\nHi,\nI have created a git repository on a remote site and have created patches\nthere. I have copied the files for the base version using which I had\ncreated the patch. However, when I use git apply --check, I get error as\npatch does not apply. Can anyone please help? I'm stuck at this and is very\nimportant for my workflow.\n-- \nView this message in context: http://git.661346.n2.nabble.com/How-to-apply-patches-tp5747036p5747036.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"156046","messageId":"AANLkTinR5Z60u5DYzgzuB0x7CmA8kVR04nLDJ4csDZJK@mail.gmail.com","threadId":"25768","inReplyTo":"1289988042359-5747036.post@n2.nabble.com","subject":"Re: How to apply patches","fromName":"Tay Ray Chuan","fromEmail":"rctay89@gmail.com","sentAt":"2010-11-17T14:13:34Z","receivedAt":"2010-11-17T14:13:34Z","isPatch":false,"sender":{"key":"rctay89@gmail.com","avatar":"https://avatars.githubusercontent.com/u/61553?v=4"},"body":"Hi,\n\nOn Wed, Nov 17, 2010 at 6:00 PM, Ananth <smilewithani@gmail.com> wrote:\n> I have copied the files for the base version using which I had\n> created the patch.\n\nDid you\n\n  $ git add . # note the <dot>\n\nand\n\n  $ git commit\n\nthe destination (\"base version\") repo before applying?\n\n-- \nCheers,\nRay Chuan\n"},{"id":"156050","messageId":"1290006076573-5748001.post@n2.nabble.com","threadId":"25768","inReplyTo":"AANLkTinR5Z60u5DYzgzuB0x7CmA8kVR04nLDJ4csDZJK@mail.gmail.com","subject":"Re: How to apply patches","fromName":"Ananth","fromEmail":"smilewithani@gmail.com","sentAt":"2010-11-17T15:01:16Z","receivedAt":"2010-11-17T15:01:16Z","isPatch":false,"sender":{"key":"smilewithani@gmail.com","avatar":null},"body":"\nHi Tay Ray,\nThanks for the reply. the problem is now resolved. The problem was that the\npatches created were in Unix format (only CR) while when I uploaded the\npatches through FTP site, they were converted to Windows format (CRLF) which\nwas preventing from the patches from getting applied. I changed the files to\nunix format again and the problem got resolved.\n-- \nView this message in context: http://git.661346.n2.nabble.com/How-to-apply-patches-tp5747036p5748001.html\nSent from the git mailing list archive at Nabble.com.\n"}]}