0

I'm using Mercurial but I'm using the following as my branching model:

enter image description here

I have a feature that I'm working on, so it's in it's own feature branch. However, I have some smaller items I've changed in the development branch that I'd like to use while working on the specific feature way over yonder in the other branch. Is it permissible to merge development into that feature branch given this model? Or would that be violating this model?

Lester Peabody
  • 1,868
  • 3
  • 20
  • 42
  • I think it'll be fine as long as you don't find that the smaller items end up being removed from the development branch, because then you'll have to remove them from your feature branch. If your feature depends on those items, though, it is hard to avoid the merge. – Jonathan Leffler Nov 30 '12 at 22:16

1 Answers1

1

Is it permissible to merge development into that feature branch given this model?

No in common sense.

You made workflow violation earlier: when "have some smaller items I've changed in the development branch" - these changes must be in separate feature branch(es), which you can merge in your feature branch or (better) into temporary "combined" (your + side) branch: in case of ideal nvie-workflow develop-branch have to contain only mergesets from task-branches

PS - from other side "not man for the Sabbath, but the Sabbath was made for man" and you'll have only dirty history in case of your merge

Lazy Badger
  • 94,711
  • 9
  • 78
  • 110