this post was submitted on 08 Nov 2023
85 points (85.7% liked)

Programming

17483 readers
199 users here now

Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!

Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.

Hope you enjoy the instance!

Rules

Rules

  • Follow the programming.dev instance rules
  • Keep content related to programming in some way
  • If you're posting long videos try to add in some form of tldr for those who don't want to watch videos

Wormhole

Follow the wormhole through a path of communities [email protected]

founded 1 year ago
MODERATORS
snowe
Ategon
[email protected]
85
Why Git is hard (roadrunnertwice.dreamwidth.org)
submitted 1 year ago by learnbyexample to c/programming
62 comments fedilink hide all child comments
you are viewing a single comment's thread
view the rest of the comments
[โ€“] [email protected] 1 points 1 year ago (1 children)

A git branch is just a pointer to a commit, it really doesn't correspond to what we'd naturally think of as a branch in the context of a physical tree or even in a graph.

But as the article points out, a commit includes all of its ancestors. Therefore pointing to a commit effectively is equivalent to a branch in the context of a tree.

Some other version control systems like mercurial have both a branch in a more intuitive sense (commits have a branch as a bit of metadata), as well as pointers to commits (mercurial, for example, calls them bookmarks).

I mean, git has bookmarks too, they're called tags.

[โ€“] [email protected] 1 points 1 year ago

What happens after you merge a feature branch into main and delete it? What happens to the branch?

Afterwords, what git commands can you run to see what commits were made as part of the feature branch and which were previously on main?

Mercurial bookmarks correspond to git branches, while mercurial tags correspond to git tags.