search

innoq / statuses

statuses
Apache License 2.0
13 stars 14 forks source link

added character count for input fields #36

Closed FND closed 11 years ago

FND commented 11 years ago

addresses #34

as always, please note the commit messages

stilkov commented 11 years ago

When trying to apply the patch locally, I get an error I can't make sense of:

error: patch failed: public/statuses/js/jquery.js:1
error: public/statuses/js/jquery.js: patch does not apply
Patch failed at 0003 moved third-party libraries to separate directory

Likely my lack of git knowledge - or is there anything obvious that may be wrong here?

FND commented 11 years ago

Weird, this works for me:

$ git clone git://github.com/innoq/statuses.git
$ cd statuses/
$ git remote add FND git://github.com/FND/statuses.git
$ git fetch FND
$ git checkout -b tmp
$ git pull FND charcount

Do you perhaps have untracked files that might interfere? Which command(s) did you use?

stilkov commented 11 years ago

My local working directory is in sync with the remote origin (master here). I typically use 

 curl https://github.com/innoq/statuses/pull/36.patch | git am
stilkov commented 11 years ago

Hm. Tried your approach, had to manually resolve a merge conflict around the lib refactoring (which really should have been its own commit, right?), seems to work, testing now.

FND commented 11 years ago

I typically use curl #36 | git am

I didn't know about that - nice!

Not sure why the patch fails though...

the lib refactoring (which really should have been its own commit, right?)

It is a separate commit - just not a separate pull request. Indeed, I'd put it last specifically so the other two commits could be applied without that refactoring.