diffconflicts
tmux
diffconflicts | tmux | |
---|---|---|
16 | 209 | |
380 | 33,243 | |
- | 1.9% | |
2.4 | 8.3 | |
4 months ago | 2 days ago | |
Vim Script | C | |
BSD 3-clause "New" or "Revised" License | GNU General Public License v3.0 or later |
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
diffconflicts
-
Ask HN: Share a shell script you like
diffconflicts [dc] lets you resolve diffs as a two way diff between what's in the conflict markers instead of including the resolved parts in the diff. It opens the diff in vim but could be adapted for other editors. Verbose explanation: https://github.com/whiteinge/diffconflicts/blob/master/READM...
The author converted it to a vim plugin with the same name, but I use a different vim plugin implementation [mergetool].
[dc]: https://github.com/whiteinge/dotfiles/blob/master/bin/diffco...
-
Integrating Git and (Neo)Vim: LazyGit + Fugitive + MergeTool for maxiumum efficiency [Showcase]
I like vim-mergetool for merging in vim. It's inspired by the diffconflicts method (but written in vimscript): Diff the resolved conflicts instead of a three way diff with base. You can also switch to three way with :MergetoolToggleLayout LmR too, but I usually only switch to diffing resolved against theirs or ours.
-
Poll: how do you jump to Git conflict markers?
https://github.com/whiteinge/diffconflicts as a merge tool
-
What is the coolest, unknown(-ish) plugin that you're using that other people could benefit from?
https://github.com/whiteinge/diffconflicts is not unknown, but I think deserves way more attention. It transforms the way you resolve merge conflicts unlike any other tool I've seen.
-
Your git setup for neovim?
For resolving conflicts, I like https://github.com/whiteinge/diffconflicts. It's really good at cutting the noise from conflict markers and only showing what matters.
- Here's a question
-
Vim Regex
For resolving conflicts I recommend https://github.com/whiteinge/diffconflicts, the demo video explains it best https://www.youtube.com/watch?v=Pxgl3Wtf78Y.
-
What have you changed in your VIM workflow recently?
have you tried diffconflicts? started using it ages ago, might be worth checking out if you get tired of editing by hand.
- Which tools do you use for Git Conflicts?
-
Is there a better way to see git diff in vim?
I end up using https://github.com/whiteinge/diffconflicts it does the job I have looked for, I have adjusted the way it a bit to look more like 3 splits solver rather with 2 splits.
tmux
- Chained ttys for side-by-side reading
-
Let's See Your Terminal
This got me thinking about my recent pivot, my switch to Neovim by way of LazyVim to write most of my code, and using tmux to keep terminal states alive after closing a session.
-
Just How Much Faster Are the Gnome 46 Terminals?
I use Tmux. It's a terminal-agnostic multiplexer. Gives you persistence and automation superpowers.
https://github.com/tmux/tmux/wiki
-
Easy Access to Terminal Commands in Neovim using FTerm
Having a common set of tools already set up in different windows or sessions in Tmux or Zellij is obviously an option, but there is a subset of us ( 👋 ) that would rather just have fingertip access to our common tools inside of our editor.
-
Using Shell Scripting to simplify your Shopify App development workflow 🐚
Once you have your Mac or Linux machine ready, make sure to downlaod and install TMUX (Terminal Mulitplexer). A lot of our scripts are going to be running headless inside of a TMUX session as it's an incredibly clean way to manage and organise different workspaces simultaneously. A lot of our scripts will help us to interact with TMUX so don't worry if it looks a little intimidating at first. You can install TMUX using your package manager in the terminal, use whichever applies to you:
-
Zellij – A terminal workspace with batteries included (tmux alternative)
After having spent too much time trying to get the simple https://github.com/csdvrx/sixel-tmux/ features into mainline tmux (last November https://github.com/tmux/tmux/issues/3753), maybe it'd be easier to jump ship as use zellij?
Could anyone offer recommendations on "riced" zellij configuations, or just a demo where it shows doing with (say charts of disk usage per folder), watching a movie with mpv + keeping a vim to type on?
-
Automating the startup of a dev workflow
Well, I now use tmux and tmuxinator. I have had many failed tmux attempts over the years, but I'm firmly bedded in now.
-
Clipboards, Terminals, and Linux
Which leads me to clipboards. Linux has two of them! Adding to the interest, I typically use Neovim remotely, via an SSH connection to a Tmux session. And on my Linux system, I use urxvt as my terminal program. All of these are very UNIX-y tools, and somehow they all need to play nicely together.
-
Connecting Debugger to Rails Applications
The downside of overmind is that it requires tmux, which is a terminal multiplexer tool. If you don't already use tmux, I'd say it's probably not worth learning it just for the purposes of using overmind. But if you're like me and already know/use tmux, this can be a great solution to pursue.
- Enchula Mi Consola
What are some alternatives?
lazygit.nvim - Plugin for calling lazygit from within neovim.
zellij - A terminal workspace with batteries included
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
kitty - Cross-platform, fast, feature-rich, GPU based terminal
conflict-marker.vim - Weapon to fight against conflicts in Vim.
tilix - A tiling terminal emulator for Linux using GTK+ 3
vim-diff-enhanced - Better Diff options for Vim
toggleterm.nvim - A neovim lua plugin to help easily manage multiple terminal windows
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
i3 - A tiling window manager for X11
neovim - Vim-fork focused on extensibility and usability
Mosh - Mobile Shell