Skip to content

jdcast/kaggle-projects

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

25 Commits
 
 
 
 
 
 

Repository files navigation

Repository for holding kaggle projects

kaggle-projects

Requirements

  • python 2.7
  • anaconda

Installation

  • git clone git@github.com:jdcast/kaggle-projects.git
  • cd kaggle-projects

Todo

git workflow

  • work on a branch cut from master: git co -b features/the-name-of-your-story
  • rebase your branch before merging: git rebase master
  • merge with --no-ff to create merge commits: git merge features/the-name-of-your-story --no-ff
  • commit early and often
  • commit messages: present tense and begin with a capital: 'Add cookies to jar'
  • when your branch is ready, git push and create a pull request for it on github

sample git workflow

  • open laptop to start work
  • git pull (on master branch)
  • git checkout -b feature/my-new-feature-branch (feature branch)
  • do some work
  • git add -A
  • git commit -am ""
  • git checkout master
  • git pull
  • git checkout feature/my-new-feature-branch
  • git rebase master (plays the feature branch on top of the master branch so that they are compatible when trying to merge later)
  • now resolve any conflicts that might occur in the rebase
  • git pull (if someone else is using your feature branch otherwise not necessary)
  • git push -f
  • go to github
  • submit PR for feature branch
  • we review
  • we clean up if necessary
  • we final okay
  • go to github and merge
  • delete feature branch (two commands needed here that I forget at the moment but they are easy ones)

Tools (following is only for linux/os-x: vim + tmux + git)

*.swp
*.swo
  • add .gitconfig to ~/ directory (if not already there) with following at top so as to enable automatic reference management when using git push so that git push <branch> translates to simply git push:
[push]
	default = current
  • add .vimrc to ~/ directory (if not already there). Folliwng is a good starting point for .vimrc (this will accomplish all of the required steps for the file in the above walkthroughs but feel free to expand and share :) ):
set nocompatible
filetype off    " Required

set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin()

" Required
Bundle 'VundleVim/Vundle.vim'   

" solarized theme
Bundle 'altercation/vim-colors-solarized'

" coffeescript
Bundle 'kchmck/vim-coffee-script'

" jade
Bundle 'digitaltoad/vim-jade'

" JSON
Bundle 'elzr/vim-json'

call vundle#end()

" Don't create swap files
set noswapfile

" Some settings to enable the theme:

" Show line numbers
set number 

" Show matching brackets
set showmatch

" Do case insensitive matching
set ignorecase

set ruler
set nowrap

set tabstop=2
set shiftwidth=2
set expandtab

"set completion-ignore-case on
"set show-all-if-abmiguous on
"TAB: menu-complete

" Use syntax highlighting
syntax enable

set background=dark

let g:solarized_termcolors = 256

colorscheme solarized


" Required
filetype plugin indent on

About

Repository for holding kaggle projects

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published