I push a file to a remote repo and get a merge conflict error. I know my file is totally correct - there's no need to look through the code, I just want to overwrite the remote file with mine.
I've tried: - git merge --strategy-option ours PATH/FILE - git checkout --ours PATH/FILE - git pull --ours PATH/FILE but none of these seem to work. It either throws an error or doesnt overwrite the remote file. What's the correct way of doing this? Thanks -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
