Not sure how to do it on the command line, but eclipse has this nice command called "mark as merged" which basically tells eclipse to ignore any remote changes and not try to update your file.