How do I force "my changes" when merging in git? Someone put all bin directories in git and now I have a terrible merge conflict :(
Now it says the following:
When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort".
I do NOT want to merge, i just want to delete all those files using my changes.
EDIT: Most of the files was successfully merged, either through automatic merge or because there was no conflict. However quite a few still exist like the following one.
warning: Cannot merge binary files: src/reports/obj/Debug/TempPE/GroupMailDS.Designer.cs.dll (HEAD vs. added gitignore)