Tag: osx

git merge fails with “Untracked working tree file” on case change

On Mac OS X, I have two branches – say A and B – and I want to merge A into B. When I try to do git merge A on B, I get: error: Untracked working tree file ‘path/file.php’ would be overwritten by merge. Aborting This is caused by the fact that some change […]

brew doctor Warning: How to add git to PATH?

I installed Homebrew on OS X El Capitan. In the last steps of the installation I was supposed to install git with brew install git which was fine. Now if I run ‘brew doctor’ this happens: $ brew doctor Please note that these warnings are just used to help the Homebrew maintainers with debugging if […]

git: 'pull' is not a git command. See 'git –help'

Possible Duplicate: “git pull” broken Using git version 1.7.5.4 on my MAC When trying to pull from remote, i am getting the git: ‘pull’ is not a git command. See ‘git –help’. error. This used to work. Something changed on my system, not sure what. How can this be resolved please? What might be the […]

'git grep' and word boundaries on Mac OS X and BSD

I run git grep “\<blah\>” regularly on my linux development server, but I just discovered that I am not able to use \< and \> on Mac (Mac OS X 10.6.8) (not able to use = it does not find anything). Is the regular expressions syntax different in Mac? I tried using git grep -E […]

git-core has been made obsolete by the port git

I want to run “repo” command on Mac (And download the code from Git repo). I was following the above guide: http://threadeds.blogspot.com/2009/02/getting-started-with-google-android-on.html When I execute the command, POSIXLY_CORRECT=1 sudo port install gmake libsdl git-core gnupg I get this error: I’m having the following issue while installing Error: git-core has been made obsolete by the port […]

bad numeric config value when using git clone

Whenever I use git clone, I get this message. What shall I do? fatal: bad numeric config value ‘5242880000’ for ‘http.postbuffer’: out of range

Cannot find FileMerge (opendiff tool) but I have xcode 4.6 installed

When I attempt to run FileMerge as a GUI for Opendiff, I receive an error: $ git mergetool -t opendiff Merging: Gemfile Gemfile.lock … Normal merge conflict for ‘Gemfile’: {local}: modified file {remote}: modified file Hit return to start merge resolution tool (opendiff): 2013-12-26 20:00:20.248 opendiff[22367:e07] Couldn’t find FileMerge Gemfile seems unchanged. Was the merge […]

Should git ignore the *.pch files created by XCode?

Should I add *.pch files to .gitignore in XCode projects?

Can't push branch to github “Use git@github.com:Paratron/spacebattles.git”

I have a working branch in my Mac names database and I would like to push this branch to GitHub and have tried to do this by running: git push -u origin database And get the following error message: You can’t push to git://github.com/Paratron/spacebattles.git Use git@github.com:Paratron/spacebattles.git Are there known issues that could be the cause […]

Setting up Github on a new computer

I am an almost perfect beginner at Github so please humor me with this elementary question. I have a laptop PC that I’ve been using to interact with a repo on Github. I just bought a Mac and I would like to do my programming on both machines. I have installed Git on the new […]

Git Baby is a git and github fan, let's start git clone.