Simply the best solution so far (make fast-forwarding off by –no-ff): git pull –no-ff Thanks to Dheeraj Kumar Rao for this useful answer.
Tag: git
ignoring any ‘bin’ directory on a git project
The way to ignore all directories called bin anywhere below the current level in a directory tree is with a .gitignore file with the pattern: bin/
How to create a .gitignore file in Windows
If you’re using Windows it will not let you create a file without a filename in Windows Explorer. It will give you the error “You must type a file name” if you try to rename a text file as .gitignore You can get around this Windows Explorer error by appending a dot to the filename without […]