For his first case rather then merging his feature branch into master he should instead merge his master branch into his feature one. Do this regularly if you c

For his first case rather then merging his feature branch into master he should instead merge his master branch into his feature one. Do this regularly if you can (without interrupting your feature development) then when it comes time to merge your feature branch into master it should be conflict free as you worked your conflicts when you pull master into the feature branch.