SeniorMars SeniorMars

## vimdiff.md

      
              1 file
            
          
              0 forks
            
          
              0 comments
            
          
              0 stars
            
          
                SeniorMars
                / vimdiff.md
            
            
              Created
              June 14, 2024 00:00
                — forked from mattratleph/vimdiff.md
            
              
                vimdiff cheat sheet
              
          
    vimdiff cheat sheet

##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c and [c.
Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)

:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)

  
## example.tex
\documentclass[11pt]{article}
\usepackage[dvipsnames]{xcolor}        % write text in pretty colors
\usepackage[hidelinks]{hyperref}   % makes section links, bibliography links clickable
\usepackage{bm}
\usepackage{booktabs}  % for pretty tables
\usepackage{enumerate}
\usepackage{fullpage}
\usepackage{graphicx}   % include images
\usepackage{hyperref}
\usepackage{listings}   % include the contents of code files (avoids version issues!)

## java.vim
filetype plugin indent on
syntax on "activates syntax highlighting among other things
set autoindent "indent base on previous and syntax
set backspace=indent,eol,start "Fixes the backspace
set foldmethod=indent "fold your code.
set hidden "work with multiple unsaved buffers.
set incsearch "highlights as you search
set ignorecase
set smartcase
set relativenumber number "sets line numbers

## pokemon.csv

          
            #
            Name
            Type 1
            Type 2
            Total
            HP
            Attack
            Defense
            Sp. Atk
            Sp. Def
            Speed
            Generation
            Legendary

            
              1
              Bulbasaur
              Grass
              Poison
              318
              45
              49
              49
              65
              65
              45
              1
              False

            
              2
              Ivysaur
              Grass
              Poison
              405
              60
              62
              63
              80
              80
              60
              1
              False

            
              3
              Venusaur
              Grass
              Poison
              525
              80
              82
              83
              100
              100
              80
              1
              False

            
              3
              VenusaurMega Venusaur
              Grass
              Poison
              625
              80
              100
              123
              122
              120
              80
              1
              False

            
              4
              Charmander
              Fire
              
              309
              39
              52
              43
              60
              50
              65
              1
              False

            
              5
              Charmeleon
              Fire
              
              405
              58
              64
              58
              80
              65
              80
              1
              False

            
              6
              Charizard
              Fire
              Flying
              534
              78
              84
              78
              109
              85
              100
              1
              False

            
              6
              CharizardMega Charizard X
              Fire
              Dragon
              634
              78
              130
              111
              130
              85
              100
              1
              False

            
              6
              CharizardMega Charizard Y
              Fire
              Flying
              634
              78
              104
              78
              159
              115
              100
              1
              False
	\documentclass[11pt]{article}
	\usepackage[dvipsnames]{xcolor} % write text in pretty colors
	\usepackage[hidelinks]{hyperref} % makes section links, bibliography links clickable
	\usepackage{bm}
	\usepackage{booktabs} % for pretty tables
	\usepackage{enumerate}
	\usepackage{fullpage}
	\usepackage{graphicx} % include images
	\usepackage{hyperref}
	\usepackage{listings} % include the contents of code files (avoids version issues!)
	filetype plugin indent on
	syntax on "activates syntax highlighting among other things
	set autoindent "indent base on previous and syntax
	set backspace=indent,eol,start "Fixes the backspace
	set foldmethod=indent "fold your code.
	set hidden "work with multiple unsaved buffers.
	set incsearch "highlights as you search
	set ignorecase
	set smartcase
	set relativenumber number "sets line numbers
#	Name	Type 1	Type 2	Total	HP	Attack	Defense	Sp. Atk	Sp. Def	Speed	Generation	Legendary
1	Bulbasaur	Grass	Poison	318	45	49	49	65	65	45	1	False
2	Ivysaur	Grass	Poison	405	60	62	63	80	80	60	1	False
3	Venusaur	Grass	Poison	525	80	82	83	100	100	80	1	False
3	VenusaurMega Venusaur	Grass	Poison	625	80	100	123	122	120	80	1	False
4	Charmander	Fire		309	39	52	43	60	50	65	1	False
5	Charmeleon	Fire		405	58	64	58	80	65	80	1	False
6	Charizard	Fire	Flying	534	78	84	78	109	85	100	1	False
6	CharizardMega Charizard X	Fire	Dragon	634	78	130	111	130	85	100	1	False
6	CharizardMega Charizard Y	Fire	Flying	634	78	104	78	159	115	100	1	False