#git
https://mergebase.com/doing-git-wrong/2018/03/07/fun-with-git-pull-rebase/
> Some people claim āgit fetch; git rebase origin/masterā is equivalent to āgit pull -rā, but it isnāt.
git pull -r also deals with squashes.
#TIL
> Rebase hell happens when several commits on your branch edit the same area, and upstream also touched the same area. The problem occurs because each conflict resolution will itself conflict with the subsequent commit in the series.
https://mergebase.com/doing-git-wrong/2018/03/07/fun-with-git-pull-rebase/
> Some people claim āgit fetch; git rebase origin/masterā is equivalent to āgit pull -rā, but it isnāt.
git pull -r also deals with squashes.
#TIL
> Rebase hell happens when several commits on your branch edit the same area, and upstream also touched the same area. The problem occurs because each conflict resolution will itself conflict with the subsequent commit in the series.
