Sign in
gerrit
/
training
/
gerrit
/
f75025336f9bade8ce4601ff75a232d233bf6504
/
.
/
presentations
/
git-gerrit-workshop
/
merge-vs-rebase.txt
blob: 8d16036323903c84c7ffa01d526f0aba0680c310 [
file
] [
log
] [
blame
]
Merge vs Rebase
---------------
image:../../img/path-conflict.png[]
CAUTION: Resolve Path Conflict not by merge, but by rebase!