this post was submitted on 09 Jul 2023
33 points (100.0% liked)
Programming
17406 readers
94 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 1 year ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
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.
If you copied pasted your config and don’t know what each line does, delete it.
Also, don't forget to personally audit Linux source code, before you use it.