commit before pulling the new code
merge base
merge