Your code works perfectly on your machine and you decide to integrate this achievement into your remote Git repository. Just before pushing the commits you suddenly detect a picture of your cat (!) accidentally added to your branch several commits ago. You are trying to resolve the problem using random advice from Stack Overflow, but the situation goes out of control and finally, you lose all today’s hard work. Angrily you remove the local repo and clone it again just to start from the beginning, hoping that a similar situation will never happen again. [Spoiler: it will] In this session, I will discuss common mistakes we make while working with Git and how to fix these without much pain. It is intended for those of you that just got started using Git or with intermediate experience, but advanced Git users might also find it interesting. Highly recommended to join if you want to add some useful commands to your git pull, git checkout, git commit and git push list.

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

2. 2

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

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

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

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

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

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

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

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