2

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):

enter image description here

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.

A__
  • 1,616
  • 2
  • 19
  • 33

1 Answers1

1

You don't have to merge back dev to feature each time you add more commits.
You can just add those commits and push your feature branch.

You should still merge feature to dev locally if you want to check everything is still working there.

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250