If the branches are only local, you can use -d if the branch has been merged, like If the branch contains code you never plan on merging, use -D instead. If the branch is in the upstream repo (on Bitbucket) you can remove the remote reference by Also, if you’re on the Bitbucket website, you can remove branches you’ve … Read more
If you are using two-factor authentication with GitHub you will need to create a personal access token and use it with SourceTree: To work with GitHub’s two-factor authentication in SourceTree you can simply use your access token instead of your password. The steps to do this are as follows: Go to your Personal Access Tokens … Read more
Git hub has removed TLS-1.0 from it’s authentication services. https://githubengineering.com/crypto-removal-notice/ Solutions Windows Clients Use Version 2.14.3 (or newer) of Git for Windows and newer include an up-to-date Git Credential Manager for Windows: https://gitforwindows.org/ You can also explicitly update your Git Windows Credencial Manager to the latest version, 1.14.0, to get TLS-1.2 support: https://github.com/Microsoft/Git-Credential-Manager-for-Windows/releases/tag/v1.14.0 Visual Studio … Read more
Here is how I did it without plugins: Create the repository on your Bitbucket account Create your project in Android Studio In Android Studio, Go to VCS Choose ‘Enable version control’ Choose Git and press OK Right click on your project, choose Git then click Add Open Terminal in Android Studio Go to your Bitbucket … Read more
git pull <remote> master:dev will fetch the remote/master branch and merge it into your local/dev branch. git pull <remote> dev will fetch the remote/dev branch, and merge it into your current branch. I think you said the conflicting commit is on remote/dev, so that is the branch you probably intended to fetch and merge. In … Read more
Finally I made it work thanks to the steps outlined in the Eclipse forum: Set up the SSH key stuff Download and install mysys git according to the github instructions at http://help.github.com/win-git-installation/ In C:/Users/you/ssh hide any existing keys (id_rsa and id_rsa.pub) in a subdirectory. If the ssh directory does not exist, create it. Of course, “you” is … Read more
If you just created an empty Git repository on BitBucket, try and make sure to make at least one commit (or push one commit) to it. Do that before referencing that repository as a submodule in your second local repository.
What this means Your upstream—the remote you call origin—no longer has, or maybe never had (it’s impossible to tell from this information alone) a branch named feature/Sprint4/ABC-123-Branch. There’s one particularly common reason for that: someone (probably not you, or you’d remember) deleted the branch in that other Git repository. What to do This depends on what you want. … Read more
Remove directory from git and local You could checkout ‘master’ with both directories; Remove directory from git but NOT local As mentioned in the comments, what you usually want to do is remove this directory from git but not delete it entirely from the filesystem (local) In that case use:
For me it helped to change the version of buildTools to: You will find this setting inside the file app/build.gradle.