ummahusla

# overwrite master with contents of feature branch (feature > master)
git checkout feature      # source name
git merge -s ours master  # target name
git checkout master       # target name
git merge feature         # source name

ummahusla

Modes

Vim has two modes insertion mode and command mode. The editor begins in command mode, where the cursor movement and text deletion and pasting occur. Insertion mode begins upon entering an insertion or change command. [ESC] returns the editor to command mode (where you can quit, for example by typing :q!). Most commands execute as soon as you type them except for "colon" commands which execute when you press the ruturn key.

Quitting

• :x Exit, saving changes
  
• :q Exit as long as there have been no changes
  
• ZZ Exit and save changes if any have been made
  
• :q! Exit and ignore any changes
  

Inserting Text