fearure_branch_flow.md

Approach to keep a feature_branch up to date with the development branch

Where more than one developer could be working in the feature_branch, creating branch using as base feature_branch

ensure to be up to date with feature_branch

git checkout feature_branch
git pull origin feature_branch

ensure to be up to date with development

git checkout development
git pull origin development

merge development in feature_branch

git checkout feature_branch
git merge development

push to feature_branch

git push origin feature_branch

In the same way, If you are working in a PR with base: feature_branch and you have conflict, then you can try

git checkout feature_branch
git pull origin feature_branch
git checkout branch_name
git merge feature_branch
git push origin branch_name