$ git status
# On branch master
# Your branch is ahead of ‘origin/master’ by 389 commits.
#
nothing to commit (working directory clean)
git checkout master
git filter-branch —index-filter ‘git rm —cached —ignore-unmatch credentials.yml’ —prune-empty — —all
git pull
error: Your local changes to the following files would be overwritten by merge:
config/actions.yml
config/deploy.rb
views/dispatch.erb
Please, commit your changes or stash them before you can merge.
git init
git add *
git commit -a -m ‘initial commit and release!’
pull request merged!
git commit -am ‘added debug log’
git commit -am ‘more debug logging’
git commit -am ‘even more debug logging’
git commit -am ‘logs’
git commit -am ‘lkjasfd’
git commit -a -m ‘stuffs’
git push
git revert HEAD
git checkout master
config/unicorn.rb: needs merge
error: you need to resolve your current index first
git init
echo ‘*’ > .gitignore
