Git steps

gistfile1.txt

1. Checkout
2. Status
3. commit -a -m "your message here"
4. checkout develop
5. pull
6. status
7. merge _________ *
8. re-run the build
9. push origin develop
10. git branch ________ (name of new branch)
11. git branch -D _______ (name of old branch)

* If there is a conflict, do this for each file:
a. git checkout --ours file/name/here.x
b. git checkout --theirs file/name/here.x
c. git add file/name/here.x
AFTER adding all files you want to use 'theirs' for,
d. git commit -m "using theirs"
e. git pull origin develop
f. (go back to step 6...)