Mordecai K. insidemordecai

Here's a little walkthrough of how Yannick and I are using feature branches and pull requests to develop new features and adding them to the project. Below are the steps I take when working on a new feature. Hopefully this, along with watching the process on Github, will serve as a starting point to having everyone use a similar workflow.

Questions, comments, and suggestions for improvements welcome!

Start with the latest on master

When starting a new feature, I make sure to start with the latest and greatest codebase:

git checkout master

	" Specify a directory for plugins
	call plug#begin('~/.vim/plugged')

	Plug 'neoclide/coc.nvim', {'branch': 'release'}
	Plug 'scrooloose/nerdtree'
	"Plug 'tsony-tsonev/nerdtree-git-plugin'
	Plug 'Xuyuanp/nerdtree-git-plugin'
	Plug 'tiagofumo/vim-nerdtree-syntax-highlight'
	Plug 'ryanoasis/vim-devicons'
	Plug 'airblade/vim-gitgutter'

	syntax on " enable syntax highlighting
	set background=dark " we like it dark!
	try \| colorscheme gruvbox \| catch \| endtry " use this awesome theme if possible
	highlight Pmenu ctermbg=black guibg=black \| " fix popup color so it's easier to read
	filetype plugin on " load plugins based on file type
	filetype indent on " load indent settings based on file type
	set shiftwidth=2 " number of spaces to use for indenting
	set softtabstop=2 " number of spaces to use when inserting a tab
	set tabstop=2 " show tabs as 2 spaces
	set expandtab " convert tabs into spaces

	# 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