What worked for me is something similar to what rohitmohta is proposing ; in regular DOS command prompt (not on git bash) : first and in some cases also then (I confirm it’s necessary : if set to true getting “SSL certificate problem: unable to get local issuer certificate” error) in my case, no need … Read more
From SourceTree, click on Tools->Options. Then on the “General” tab, make sure to check the box to allow SourceTree to modify your Git config files. Then switch to the “Diff” tab. On the lower half, use the drop down to select the external program you want to use to do the diffs and merging. I’ve … Read more
I get this error when I try to change branch. Probably I will give some information of the commands at upon command: I get following output And when I try the command I get following output: config file contents: repositoryformatversion = 0 filemode = true bare = true url = /path/to/git/repo/.git
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
Make sure the project was cloned and not downloaded as a zip into the directory you are using (there should be C:\Users\paula\Git\OpenTripPlanner.git directory on your disk). and make sure your gpath to git executable is indicating the correct path.
The only specific reasons to set autocrlf to true are: avoid git status showing all your files as modified because of the automatic EOL conversion done when cloning a Unix-based EOL Git repo to a Windows one (see issue 83 for instance) and your coding tools somehow depends on a native EOL style being present in your file: for instance, a code generator hard-coded to detect native EOL … Read more
It happens every time I’m forced to change the Windows password and none of the above answers helped me. Try the below solution which works for me: Go to Windows Credential Manager. This is done in an EN-US Windows by pressing the Windows Key and typing ‘credential’. In other localized Windows variants you need to use … Read more
Two problems: 1 – You never told Git to start tracking any file You write that you ran and that, at that stage, you got Git is telling you that you never told it to start tracking any files in the first place, and it has nothing to take a snapshot of. Therefore, Git creates … Read more
git remote update will update all of your branches set to track remote ones, but not merge any changes in. git fetch will update only the branch you’re on, but not merge any changes in. git pull will update and merge any remote changes of the current branch you’re on. This would be the one you use to update a … Read more
It looks like not having (lib)curl-devel installed when you compile git can cause this. If you install (lib)curl-devel, and then rebuild/install git, this should solve the problem: This worked for me on Centos 6.3. If you don’t have yum, you can download the source to curl-devel here: http://curl.se/dlwiz/?type=devel If you are running Ubuntu instead: