this post was submitted on 09 Jul 2023
32 points (100.0% liked)

Programming

18180 readers
7 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 !webdev@programming.dev



founded 2 years ago
MODERATORS
top 7 comments
sorted by: hot top controversial new old
[–] pythoneer@programming.dev 10 points 2 years ago

What is the right chronological order of the git saga? Should I read this before of after the git checkout trilogy?

[–] autonomous@lemmy.villa-straylight.social 7 points 2 years ago (1 children)

so bloody complicated it needs a book

[–] theherk@lemmy.world 2 points 2 years ago

So powerful… is another way to look at it.

[–] slipperydippery@lemmy.world 2 points 2 years ago (1 children)

I've accidentally had my git config set to rebase at my work. Every git pull merge dragged me into some conflict hell.

I'm still interested and will read this article, mainly to see if there is a way to use it if the rest of the department isn't.

[–] BoomBoomLemon@lemmy.world 2 points 2 years ago (1 children)

If you copied pasted your config and don’t know what each line does, delete it.

[–] trot_wiertnik_zawis@programming.dev -1 points 2 years ago* (last edited 2 years ago)

Also, don't forget to personally audit Linux source code, before you use it.

[–] vimzim@feddit.nl 2 points 2 years ago

I recommend Drew Devault's guide https://git-rebase.io/ it's shorter and easier to follow.

load more comments
view more: next ›