Skip to main content


Items tagged with: git

Solving #Git conflicts with #Vim is easy!

🚀 Plugin (neovim):

It took just 3 key bindings to resolve the following conflict! 🎉

• c-o -> apply "choose ours" strategy
• ]-x -> go to the next conflict
• c-t -> apply "choose theirs" strategy

#vim #git

One of the obscure features of Git is definitely subtrees 😵‍💫

🐚 Subtree Tutorial:

💫 Subtree Basics:

#git #commandline

Git migration completed!

We are proud to announce that the migration to Git packaging succeeded! 🥳

Thanks to everyone who has helped during the migration!

#ArchLinux #TheGitMigration #Linux #Git

TIL #Git does not store file permissions except for the executable bit. So it isn't possible to mark a file as read-only in a repository 💔