-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
Update master from dev (nlog 5) #4931
Comments
Really hate source-control-merges. What about making a release-cuts ?
And then create main-branch from dev for any work related to nlog6 (and drop master-branch + dev-branch) Maybe before doing nlog6, then on might consider nlog51 with nullable-support. |
We don't need those branches as we have tags? Only if necessary hotfixes are expected for nlog 4, a branch would be nice. |
I like that one only have to make a commit to a branch, and then automatically a new version is released. |
I can see with all major version of NLog, then there have been a need to patch the previous major-version. After the adventure with NLog v4 and v5, then I see that the Nlog-git-history has become huge mess, because of multiple huge branch-merges between dev and master. Right now using minor-builds for NLog v5 (Ex. v5.2) for marking unwanted API as obsolete (but not making breaking changes), and guiding the NLog-users towards the future API of NLog v6. I think we should continue to develop in dev-branch, but when the time arrives where pull-requests start piling up, that introduces wanted breaking changes, then nlog5-branch should be created with focus on mostly bug-fixes (maintenance-mode-only with cherry picking from dev-branch). |
Master is behind currently.
Maybe also remove dev after this, and change to master. (Needs some updates to the docs and branch rules/protection)
The text was updated successfully, but these errors were encountered: