Git Cheat Sheet
Merge a feature branch into master in one big commit
git checkout master
git merge --squash feature/xxx
Resolve any conflicts at that point and then perform a commit.
Merge a feature branch into master wihtout commit
git merge feature/xxx --no-commit --no-ff
Nice Commands during Release
mvn versions:use-latest-releases
--
JuttaFitzek - 14 Apr 2022