Re: Git add -p “Your edited hunk does not apply. Edit again”

Tanky Woo wtq1...@gmail.com writes: - coverage erase + +covhtml: + make clean + nosetests + coverage html + cd ${HTMLCOV} python -m SimpleHTTPServer So I use e to manually edit the hunk, I delete all the + lines, it seems: I can reproduce on git.git's

Re: Git add -p “Your edited hunk does not apply. Edit again”

Tanky Woo wtq1...@gmail.com writes: Stash this hunk [y,n,q,a,d,/,j,J,g,e,?]? y @@ -2,3 +3,4 @@  bbb +added line 2  ccc  ddd Stash this hunk [y,n,q,a,d,/,K,g,e,?]? y My version does n, y, not y, y. The problem is the mix of stashed/not stashed hunks. See my other message for a reproducible

Git add -p “Your edited hunk does not apply. Edit again”

I asked this question in stackoverflow a few days ago, but get no answer. link: http://stackoverflow.com/questions/29518944/git-add-p-your-edited-hunk-does-not-apply- edit-again --- An example, the original file: test: make clean nosetests clean: rm -rf htmlcov rm