Update Readme.md

Added "git merge feature/xyz --no-ff".