3 ms·
Well, at the same time, you can get yourself into funny situations that are hard to get out of without knowing the intricacies of Git (e.g. what is "detached HE
by vore 3y ago
Well, at the same time, you can get yourself into funny situations that are hard to get out of without knowing the intricacies of Git (e.g. what is "detached HEAD"?). And rebasing is absolutely not easy to understand.
- goku12 3y ago> And rebasing is absolutely not easy to understand. Rebasing is very easy to understand if you treat commits as diffs. Commits are stored as snapshots. But operations like rebase and merge act on diffs introduced by the commit (often that action is a 3-way merge). For example, when you drop/delete a commit while rebasing, the change introduced by that commit is removed from all subsequent commits. Meanwhile, another problem is that you can easily get lost if a rebase is interrupted by a conflict. This would have been easier if you could see the commits as diffs. The easiest way out I found is to do no more than 2 operations per rebase. You can do as many rebases as you wish.