Is it possible to discard a file when merging a pull-request? Also, how should I edit a file if there is no conflict and then merge the pull-request? Thanks! :)
