Comment Comment by sold I recommendgit config --global pull.ff onlyinstead, then you can use "git pull" without worries. Or,git pull --ff-only parent sold 11 years ago
git config --global pull.ff only
instead, then you can use "git pull" without worries. Or,
git pull --ff-only