1
Marcel de Vries
Moving Socrates
De reis naar een Cloud-Native IT-bedrijf

2

3
 Historical Change
Tracking
 Work as a Team
 Improve Team Speed &
Productivity
 Availability and
Redundancy

PROBLEM:
You modified locally a file
you don’t want to
4
SOLUTION:
git checkout -- {filename.type}
git checkout -- .

PROBLEM:
You did a spelling mistake in
commit message / you
forgot to add additional
changes
5
SOLUTION:
git commit --amend

PROBLEM:
You need to modify other then
last commit
6
SOLUTION:
git rebase

PROBLEM:
You need to undo local
commits
7
SOLUTION:
git reset --soft
git reset --mixed
git reset --hard

PROBLEM:
You used git reset --hard
8
SOLUTION:
git reflog
+
git cherry-pick [commit]

PROBLEM:
“Pull completed with conflicts
in the repository. Resolve the
conflicts and commit the
results. ”
9
PROBLEM:
git reset
git merge
git rebase

Liuba Gonta
Xebia | Xpirit Netherlands
lgonta@xpirit.com THANK YOU!