Skip to main content

Search

Items tagged with: git

Solving #Git conflicts with #Vim is easy!

🚀 Plugin (neovim): https://github.com/akinsho/git-conflict.nvim

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

GitHub - akinsho/git-conflict.nvim: A plugin to visualise and resolve merge conflicts in neovim

A plugin to visualise and resolve merge conflicts in neovim - GitHub - akinsho/git-conflict.nvim: A plugin to visualise and resolve merge conflicts in neovim
GitHub
#vim #git

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

🐚 Subtree Tutorial: https://www.atlassian.com/git/tutorials/git-subtree

💫 Subtree Basics: https://gist.github.com/SKempin/b7857a6ff6bddb05717cc17a44091202

#git #commandline


Git Subtree basics

Git Subtree basics. GitHub Gist: instantly share code, notes, and snippets.
Gist
#commandline #git

Git migration completed!

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

Thanks to everyone who has helped during the migration!

https://archlinux.org/news/git-migration-completed/

#ArchLinux #TheGitMigration #Linux #Git

Arch Linux - News: Git migration completed

archlinux.org
#linux #archlinux #git #thegitmigration

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 💔
#git

⇧