I made a branch feature
from another branch dev
and merged it with --no-ff
using these instructions to end up with a tree like the diagram below (but instead of "master" its dev
):
Now I've done more work on feature
and want to push it to the feature
branch (like the next yellow point in the feature
sequence in the above diagram). Do I continue on this branched branch with
$ git push origin feature
or must I do
$ git checkout dev
$ git merge --no-ff feature
each time I want to push to feature
? I want to keep feature
separate.