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 neovimGitHub
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 migration completed!
We are proud to announce that the migration to Git packaging succeeded! 🥳
Thanks to everyone who has helped during the migration!