My team is transitioning to GIT, and we are just doing our first pull-requests. Since GIT recommends every new feature have its own branch and then merge it ...

git pull --rebase origin <branch-name> In case, there are no conflicts, Git will voluntarily commit the changes on top of the updated branch. However, in case of conflicts, ...