4 ms·
Wow, that is informative, did not know. Thanks to you, and others!
by antocv 10y ago
Wow, that is informative, did not know. Thanks to you, and others!
- godd2 10y agoNo problem! :) Once I understood this, things like merging and shallow clones made a lot more sense. Although it makes rebasing more confusing. What's happening there is that git is creating patches on the fly, and then applying them to the new base, and creating new commits. But the resulting commits are snapshots of what the files would have been had you applied the patches yourself. Of course, there can still be "merge conflicts" since both branches might make changes to the same place in the same file. But since everything is a snapshot, if you have no pending changes in your working directory, hopping around the commit history is a safe action, so long as you have a branch pointing to where you left off.
- adrianN 10y agoConsider reading the article.
- godd2 10y agoI don't think it's fair to assume they didn't read the article. It's difficult to know when an explanation is succinct vs analogous, especially if you have a working model of knowledge. "A is just B" can mean more than one thing.