-
-
Notifications
You must be signed in to change notification settings - Fork 6.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add .openapi-generator/VERSION to .gitignore #245
Comments
-1 for me. First reason: Second reason: You can have conflicts everywhere inside Third reason: I am glad you start to discuss branching strategy, because I wanted to ask the question in a public area like this. Can you elaborate a little bit on Branch names? |
I think the intention of this issue is to reduce noise on merge, not to address all merge conflicts. In many cases, samples are very close between branches and resolving a simple merge resolution is easier (and probably better) than a force reset of the folder. |
As I wrote, the conflict resolution will be really easy and something like:
The old way of writing this:
(needs to be tested when we do the first merge, I just guessed the syntax) One-liner, all conflicts on @jimschubert, you are missing my first and main argument here: Since our |
4.0.0 is the next major release containing breaking changes with no fallback 3.1.0 is the next minor release containing breaking changes with fallback. 3.0.1 is the upcoming patch release due this coming weekend. |
I agree the VERSION can be useful in some cases so let's keep it for the time being and I'll document the procedure in keeping next minor, major branch in sync so that we can review to see if we can come up with better procedure/process to automate the sync or resolve the merge conflicts more easily. |
Well OK. Thank you. For the branches:
Merge direction is: |
Yes (before the release) and of course you know we'll change it to 3.0.2 after the release.
Yes, when we drop the support for 3.0.x, we'll merge 3.1.x into master |
I have documented some git command examples in the section Solving conflicts during merge |
Description
We will need to create the following branches (for breaking changes with/without fallbacks)
We will need to sync enhancements, bug fixes from master (currently 3.0.1) to these branches from time to time so I suggest we whitelist
.openapi-generator/VERSION
in gitignore to avoid merge conflicts during the sync.openapi-generator version
Latest master
Suggest a fix/enhancement
Add
.openapi-generator/VERSION
to .gitignoreThe text was updated successfully, but these errors were encountered: