Closed effigies closed 5 years ago
Didn't see this. Although most of the releases will be done off of master, I don't think this would fully improve the situation when releasing from a different branch. I'm testing that right now
I think our two approaches were equivalent.
It is still merging the full branch into master when releasing from the branch
Right. Did yours not?
Didn't check, assumed it wouldn't. Let me try again :(
In both cases, you're committing on top of the latest release, and pushing the new commit to master. It will try a fast-forward merge. If what you want is to check out master and not merge from the branch:
git fetch origin
git checkout origin/master
git add ...
git commit ...
git push origin HEAD:master