Le 23/05/2012 01:51, Vincent van Ravesteijn a écrit :
I don't understand what the problem is. If the patch modifying src/Undo.cpp was committed. Then doing "git add src/Undo.cpp && git commit --amend" will merge the new changes in the previous commit. If you had done other commits in between, you can do "git commit --fixup HEAD~n (n=0,1,2...) && git rebase -i master (for example)".
I am relieved to know that it is supposed to work as I thought it would. Now I have to understand what I really did. I was really surprised to see my local changes killed by the operation.
I'll report back if I manage to understand the problem. JMarc
