dcernst/IBL-IntroToProof — comment on commit 3dbcc2380f35c4db6c5f5035358258bd6b762e2a
File:  line 0
By dcernst:

Ah, I'm glad you were paying attention. I couldn't figure out what the heck was going on and no matter what I tried (which probably wasn't much), I couldn't get the conflicts to resolve without adding the file.

By the way, I'm using the SourceTree GUI (as opposed to the command line). As soon as I think I have things slightly figured out, I realize, I know pretty much nothing.

On Feb 21, 2012, at 3:26 PM, Jason Grout wrote:

> It looks like this gets added because of this commit: e76c078326e920a80e1bbc6264e7e00d1c942d49, which added a pdf file. Did you pull the changes back down to your repository with `git pull` to get the `.gitignore` file on your local computer?
>
> ---
> Reply to this email directly or view it on GitHub:
> https://github.com/dcernst/IBL-IntroToProof/commit/3dbcc2380f35c4db6c5f5035358258bd6b762e2a#commitcomment-993124