Popular posts

Apologies for any confusion.

I understand you fork from the dev/stable branch to create a new feature/other. My question is about merging specifically.

Once the feature/fork is complete I fail to see any benefit to pulling the dev/stable branch into the feature branch, fix the merge issues, then merge that back into the dev/stable branch.

Surely it makes more sense, once the feature is complete, to merge the feature into the dev/stable branch and test locally. It feels and looks like they are the same operation but with an additional step for the latter option in the poll. Seems unnecessary.

Hipkiss What about your team? If they push to the original branch while you are working, you will have to pull their changes and test your code again to make sure the branch is still working

Marco Alka Wouldn't that have to do be done regardless?

Hipkiss In my opinion, merging everything plus new commits from the original branch and origin has the sole purpose of testing changes, before merging the changes into the original branch and then pushing.

As a side-note: doing the tests in the feature branch keeps your local dev/stable branch clean so you could do some other stuff (which might be more important or quick changes which you need, but want to push early)