My normal process for merging in develop
to my feature\my-feature
branch is:
name@home ~/myRepo (feature/my-feature)
$ git checkout develop
$ git pull
$ git checkout feature/my-feature
$ git merge develop
$ git mergetool
Can this be replaced with:
name@home ~/myRepo (feature/my-feature)
$ git fetch
$ git merge origin/develop
$ git mergetool
Does fetch
retrieve enough information about the changes from the remote origin/develop
to allow me to merge from origin/develop
rather than develop
?
Is it bad practice to have feature/my-feature
ahead of develop
with changes from the remote origin/develop
?