Resolving merge conflicts

Q: In the Chapter 10 movie "Configuring the command prompt to show the branch," when I type the function "__git_ps1," I do not get the expected result.

A: The function "__git_ps1" was recently moved to a new file, .git-prompt.sh, as described here: https://github.com/git/git/commit/af31a456b4cd38f2630ed8e556e23954f806a3cc.

We will update the video. In the meantime, you may do the same steps you do for .git-completion.bash, but a second time using ".git-prompt.sh" as shown here: https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh.

Q: When I use the code the instructor advises in the above video ("git config
--global user.name "Nelda Street"), I still get an "Illegal Instruction"
error. I have OS 10.6.8. Am I doing something wrong?

A: The current installer version of git isn't compatible with older Mac OS versions.

https://code.google.com/p/git-osx-installer/issues/detail?id=96

1. To add "-mmacosx-version-min=10.6" as described here:

https://stackoverflow.com/questions/14268887/what-is-the-illegal-instruction-4-error-and-why-does-mmacosx-version-min-10

 

https://stackoverflow.com/questions/10177038/illegal-instruction-4-shows-up-in-os-x-lion

2. Or to use the version of git that comes with Xcode, or to use homebrew to install git instead.

http://superuser.com/questions/697144/installed-git-not-sure-how-to-get-it-working