#rebasing git

get on master branch ('git branch' [enter])

if there is an * beside another branch besides master, type: 'git checkout master [enter]'

then: 'git pull' [enter]//pulls down all the commits you're behind

(if there are conflicts go and find and resolve them in your files then add the file by typing 'git status [enter]' and then according to what result you get when it says "both modified:" type 'git add filename' [enter])

then: 'git rebase --continue' [enter]

then: 'git push' [enter]

if there are still errors, even though you've resolved, type: 'git push -f' [enter]

** If you're trying to rebase your branch against master, at this point you would need to: **

git checkout your_branch_name [enter]

git rebase master [enter]

(There could be conflicts at this stage too, as your files are compared against master. If so - address the issues that come up, save changes to the file, and add that file back in: 'git add file/path/name.erb' [enter])

then git rebase master [enter]