3 ms·
In a merge without conflicts (for example you edit one file and your friend edit another) a merge could be explained as simply pasting one folder into the other
by TrianguloY 6y ago
In a merge without conflicts (for example you edit one file and your friend edit another) a merge could be explained as simply pasting one folder into the other, but then you need to be careful to override only one of the two files.
Merging folders is not easy if you don't know what changed, but if you do know because your friend told you 'I simply modified this file' then you know how to merge them. But this information is a diff.
In this particular example you need the new folder and the what changed information. That's what I was referring to.
Rebasing...is far more advanced to explain, yes.
Edit: or you can paste your folder into theirs, but still you need to know what you changed, your diff, so it's the same.
- globular-toast 6y agoWell you just say you compare both of your new versions to the common previous version and work out how to merge them. Seeing the differences between two snapshots is something easily grasped in my experience. If you can see John changed file A and Jane changed file B then it's obvious how to merge them. When I teach git I try to convince people that such a system of keeping snapshots is a useful thing to do. Then I introduce diffing which lets you to merges. Then show how git does that automatically.