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
Topic revision: r2 - 30 Apr 2022, JuttaFitzek
This site is powered by FoswikiCopyright © by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
Ideas, requests, problems regarding Foswiki? Send feedback