What is the proper way to deal with merging branches when each branch has separate releases? #1854
Unanswered
suspiration
asked this question in
Q&A
Replies: 1 comment
-
At least for |
Beta Was this translation helpful? Give feedback.
0 replies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
My branches config is as follow
"branches": [ "master", {"name": "development", "channel": "beta", "prerelease": "beta"} ]
development branch is setup to automatically generate a prerelease when new changes are pushed. When I try to merge development into master, I'm getting conflict on CHANGELOG.MD, package.json and package-lock.json since both master and development releases have updated those files.
What is the proper way to handle this? Any help is greatly appreciated!
Beta Was this translation helpful? Give feedback.
All reactions