2 ms·
> The flow chart looks almost exactly the same for "pull" and "pull --rebase". "pull" and "pull --rebase" can cause two kind of conflicts: 1. Merge or rebase
by leni536 8y ago
> The flow chart looks almost exactly the same for "pull" and "pull --rebase".
"pull" and "pull --rebase" can cause two kind of conflicts:
1. Merge or rebase conflict inside the repository.
2. The would-be merged or rebased HEAD conflicting with the dirty working directory.
The article demonstrates the latter and it's the less important one as it's avoidable by pulling from a clean working directory or pulling a non-HEAD branch.