forensicgarlic, 6 months ago

@b0rk this is awesome, but now I have to look up tags again to remind myself how they differ from branches.

forensicgarlic, 6 months ago

@b0rk well that wasn't so bad, branches can be committed to, and tags are more permanent human readable names to a specific commit.

b0rk, 6 months ago

@forensicgarlic yeah it's not so bad!

pjacock, 6 months ago

@b0rk very clear, thanks. I might use this next time I try to teach git for The Carpentries.

Can you expand on the difference between the alternate ways to merge two branches? Beyond the picture I mean - is it just what branch is pointing at the merge-commit, or is there some asymmetry in the merge-commit wrt it’s two parents? TIA

b0rk, 6 months ago

@pjacock it's just which branch is pointing at the merge commit