What does it mean when git pull causes a conflict but git pull --rebase doesn't?
- by Jason Baker
I'm pulling from a repository that only I have access to. As far as I know, I've only pushed to it from one repository. A couple of times, I've pulled from it and gotten this:
To jbaker@192.168.2.216:tsched_dev.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'jbaker@192.168.2.216:tsched_dev.git'…