Is there a way to similary scroll to simultaneously go to next search instance on all split files? Currently I am using :windo // to search in all spl ...
Is there a way to similary scroll to simultaneously go to next search instance on all split files? Currently I am using :windo // to search in all spl ...
Problem description When merging two branches in git with conflicting files, git adds markers to the conflicting areas. For example, a file with conf ...
I'm using vimdiff from VSCode's bash terminal. How do I go to the other window in vimdiff. Typically ctrl+w + right/left arrow is used to switch from ...
I'm using vimdiff as tool when comparing with git difftool. I want to compare 2 commits with git difftool <commit1> <commit2>. Today, I h ...
I'm comparing a couple files for differences using vimdiff. In this case, one file has 11 lines of comments describing the file whereas the other has ...
I am aware of the git config option difftool.prompt true However, I am wondering if there is a way to stop diffing when return code is non-zero. I am ...
I have started using vimdiff as my git difftool, and I have accidentally used the command dp (diff put) to put some code to the other file. However, p ...
When I run git difftool --tool-help or git mergetool --tool-help, I see: vimdiff vimdiff1 vimdiff2 vimdiff3 What are these different "ver ...
I want to know : How To resolve all merge conflicts with changes from LOCAL,BASE or REMOTE with one command ? This must be possible right ? I am strug ...
Suppose I have some files in a folder. I browse the folder using vim vim myfolder. It lists the files, now I want to know how I can select two files a ...
During a merge conflict resolution, is there a way to resolve only some conflicts of a file without marking this file as "solved" or checkout the file ...
As the opening title suggests, I am trying to produce a side-by-side diff using git difftool. I am in an environment s.t. vimdiff is the only availabl ...
I have two files which have data in a format like this: cat File1.txt cat File2.txt I was wondering how I could print the diff for common keys ...
I've been having some problems with vimdiff, python and daemons. The thing is, I cannot use vimdiff with python when running the program as a daemon, ...
I'm trying to set up git mergetool to spawn vimdiff with the following splits (and a configuration customized to each split): Splits from the foll ...
I am happy working with git difftool --dir-diff with beyond compare to show overall diff across directories and files and navigate through them. Howe ...
I'm trying to learn Fugitive with a live project, particularly resolving a merge conflict as I find doing this manually pretty tedious. I don't know i ...
I use vimdiff to compare two text files. Each file has around 1000 lines. The diff works fine. However, it collapses/folds a few "same" lines like bel ...
My question is if there is a tool in linux to find the difference in two files with lines so big as 39604 chars. I tried with vimdiff, kompare, diff, ...
I am doing a cherry-pick that resulted in a merge conflict and when I resolve it, the default merge tool, Vimdiff, is opened. With 4 panes, the top be ...