Git Workflow for Feature Branch

Question

I created a feature branch a few weeks ago, made some changes, but did nothing in 2 weeks. Now the master branch has obviously changed over this time.

What is the best workflow? Reinstall the function branch using the wizard to get the latest update in my function branch or continue working with the function branch, and then update only after completion, and then start merging possible conflicts?

Answer 1

You must merge / reload ASAP. If you wait, then more differences will appear, and it will be more difficult to fix all conflicts.

/ , .

Answer 2

. .

git checkout feature_branch
git pull origin master

git checkout feature_branch
git pull master

, . -no-ff. .

, :

http://nvie.com/posts/a-successful-git-branching-model/