https://github.com/ervandew/supertab
Use vim 8+ plugins:
$ mkdir -p ~/.vim/pack/plugins/start $ git clone --depth=1 https://github.com/ervandew/supertab.git ~/.vim/pack/plugins/start/supertab
https://github.com/ervandew/supertab
Use vim 8+ plugins:
$ mkdir -p ~/.vim/pack/plugins/start $ git clone --depth=1 https://github.com/ervandew/supertab.git ~/.vim/pack/plugins/start/supertab
Step 1. Install Pathogen vim plug-in manager
https://github.com/tpope/vim-pathogen
Install to ~/.vim/autoload/pathogen.vim
.
Or copy and paste the following into your terminal/shell:
mkdir -p ~/.vim/autoload ~/.vim/bundle && \
curl -LSso ~/.vim/autoload/pathogen.vim https://tpo.pe/pathogen.vim
(If you're using Windows, change all occurrences of ~/.vim
to ~\vimfiles
.)
Add this to your vimrc:
execute pathogen#infect()
If you're brand new to Vim and lacking a vimrc, vim ~/.vimrc
and paste
in the following super-minimal example:
execute pathogen#infect()
syntax on
filetype plugin indent on
Now any plugins you wish to install can be extracted to a subdirectory
under ~/.vim/bundle
, and they will be added to the 'runtimepath'
.
Observe:
cd ~/.vim/bundle && \
git clone https://github.com/tpope/vim-sensible.git
Now sensible.vim is installed.
Step 2. Install jedi-vim plug-in
You need a VIM version that was compiled with Python 3 or later
(+python3
). You can check this from within VIM using
:python3 import sys; print(sys.version)
.
You might want to use pathogen to install jedi-vim.
(The first thing you need after that is an up-to-date version of Jedi. Install
git submodule update --init --recursive
in your jedi-vim repository.)
Example installation command using Pathogen:
git clone --recursive https://github.com/davidhalter/jedi-vim.git ~/.vim/bundle/jedi-vim
$ sudo update-alternatives --config python3
https://shermanit.blogspot.com/2023/03/how-to-install-python-pip-and-venv-on.html
Python 3.11 Released! How to Install in Ubuntu 22.04 | 20.04 | 22.10
Create a ~/.ssh/config
file and insert the line:
UserKnownHostsFile ~/.ssh/known_hosts
You will then see the message the next time you access Github (or any other sftp server), but
after that you'll not see it anymore because the host is added to the known_hosts
file. This fixes the issue, rather than just hiding the log message.
Use forward slashes to specify the UNC Path:
open('//HOST/share/path/to/file')
(if your Python client code is also running under Windows)
https://stackoverflow.com/questions/161813/how-do-i-resolve-merge-conflicts-in-a-git-repository
Try:
git mergetool
It opens a GUI that steps you through each conflict, and you get to choose how to merge. Sometimes it requires a bit of hand editing afterwards, but usually it's enough by itself. It is much better than doing the whole thing by hand certainly.
As per Josh Glover's comment:
[This command] doesn't necessarily open a GUI unless you install one. Running
git mergetool
for me resulted invimdiff
being used. You can install one of the following tools to use it instead:meld
,opendiff
,kdiff3
,tkdiff
,xxdiff
,tortoisemerge
,gvimdiff
,diffuse
,ecmerge
,p4merge
,araxis
,vimdiff
,emerge
.
Below is a sample procedure using vimdiff
to resolve merge conflicts, based on this link.
Run the following commands in your terminal
git config merge.tool vimdiff
git config merge.conflictstyle diff3
git config mergetool.prompt false
This will set vimdiff
as the default merge tool.
Run the following command in your terminal
git mergetool
You will see a vimdiff
display in the following format:
╔═══════╦══════╦════════╗
║ ║ ║ ║
║ LOCAL ║ BASE ║ REMOTE ║
║ ║ ║ ║
╠═══════╩══════╩════════╣
║ ║
║ MERGED ║
║ ║
╚═══════════════════════╝
These 4 views are
You can navigate among these views using ctrl+w. You can directly reach the MERGED view using ctrl+w followed by j.
You can edit the MERGED view like this:
If you want to get changes from REMOTE
:diffg RE
If you want to get changes from BASE
:diffg BA
If you want to get changes from LOCAL
:diffg LO
Save, Exit, Commit, and Clean up
:wqa
save and exit from vi
git commit -m "message"
git clean
Remove extra files (e.g. *.orig
). Warning: It will remove all untracked files, if you won't pass any arguments.