Your comments

#3 would be fine for me. Github pull-edit-commit-push would be even better tho :)