How do I properly force a Git add?
<p>I want to push my local files, and have them on a remote repo in openshift, without having to deal with merge conflicts. I just want my local files to be uploaded</p>