git get develop to feature branche
git checkout dev git pull git checkout feature_branch git merge dev git mergetool (resolve conflicts) git commit
git checkout dev git pull git checkout feature_branch git merge dev git mergetool (resolve conflicts) git commit