You are here:
Foswiki
>
Applications Web
>
AppHowToMain
>
AppHowToGitCheatSheet
(30 Apr 2022, JuttaFitzek)
Edit
Attach
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
E
dit
|
A
ttach
|
P
rint version
|
H
istory
: r2
<
r1
|
B
acklinks
|
V
iew wiki text
|
Edit
w
iki text
|
M
ore topic actions
Topic revision: r2 - 30 Apr 2022, JuttaFitzek
Applications
Log In
Toolbox
Create New Topic
Index
Search
Changes
Notifications
RSS Feed
Statistics
Preferences
Webs
Accnomen
Applications
BunchBucket
FAIR
FESA
Frontend
Hardware
IC
IN
Machines
Main
Sandbox
Service
System
Timing
Copyright © by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
Ideas, requests, problems regarding Foswiki?
Send feedback