cordova-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Lisa Seacat DeLuca <ldel...@us.ibm.com>
Subject Having issues with git Pull Request
Date Thu, 30 Jan 2014 20:23:07 GMT
I'm trying to pull in the Cordova translations for 3.4 which is pull 
request 182 for docs:  https://github.com/apache/cordova-docs/pull/182

But I'm getting an error with git am "patch does not apply" only for the 
chinese (zh) files.  Unfortunately it's all or nothing so it's not letting 
me at least pull in the other languages.  Anyone know how to get around 
this?

this is my git am command:
curl https://github.com/apache/cordova-docs/pull/182.patch | git am

Followed these docs:
http://wiki.apache.org/cordova/IssueWorkflow
http://wiki.apache.org/cordova/ProcessingPullRequests

Error screen shot:


Lisa


Lisa Seacat DeLuca

twitter: @LisaSeacat
website: lisaseacat.com
kickstarter: arobotstory.com
ldeluca@apache.org ldeluca@us.ibm.com
Mime
  • Unnamed multipart/related (inline, None, 0 bytes)
View raw message