You can override any checks that git does by using “force push”. Use this command in terminal git push -f origin master However, you will potentially ignore the existing work that is in remote – you are effectively rewriting the remote’s history to be exactly like your local copy.
For me it helped to change the version of buildTools to: buildToolsVersion “21.0.1” You will find this setting inside the file app/build.gradle.
Remove directory from git and local You could checkout ‘master’ with both directories; git rm -r one-of-the-directories // This deletes from filesystem git commit . -m “Remove duplicated directory” git push origin <your-git-branch> (typically ‘master’, but not always) Remove directory from git but NOT local As mentioned in the comments, what you usually want to … Read more
Check the version of Git for Windows that you are using: Starting 2.19.2, it comes with OpenSSH v7.9p1 (from 7.7 before) And… openssh 7.8 just changed the default ssh-keygen format, from a classic PEM 64-chars, to an OPENSSH one 70 chars! Only ssh-keygen -m PEM -t rsa -P “” -f afile would generate the old … Read more