Skip to content
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

Open
304NotModified opened this issue May 20, 2022 · 4 comments
Open

Update master from dev (nlog 5) #4931

304NotModified opened this issue May 20, 2022 · 4 comments
Milestone

Comments

@304NotModified
Copy link
Member

Master is behind currently.

Maybe also remove dev after this, and change to master. (Needs some updates to the docs and branch rules/protection)

@304NotModified 304NotModified added this to the 5.0 (new) milestone May 20, 2022
@snakefoot
Copy link
Contributor

snakefoot commented May 21, 2022

Really hate source-control-merges. What about making a release-cuts ?

  • create nlog4-branch from master
  • create nlog5-branch from dev

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.

@304NotModified
Copy link
Member Author

We don't need those branches as we have tags?

Only if necessary hotfixes are expected for nlog 4, a branch would be nice.

@snakefoot
Copy link
Contributor

I like that one only have to make a commit to a branch, and then automatically a new version is released.

@snakefoot
Copy link
Contributor

snakefoot commented Sep 8, 2023

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).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants