Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Merge NLog 4.7.7 to dev - #4258

#4258
Merged
snakefoot merged 12 commits into
NLog:devNLog/NLog:devfrom
snakefoot:merge477-to-devsnakefoot/NLog:merge477-to-devCopy head branch name to clipboard
Jan 21, 2021
Merged

Merge NLog 4.7.7 to dev#4258
snakefoot merged 12 commits into
NLog:devNLog/NLog:devfrom
snakefoot:merge477-to-devsnakefoot/NLog:merge477-to-devCopy head branch name to clipboard

Conversation

@snakefoot

Copy link
Copy Markdown
Contributor

No description provided.

@304NotModified

Copy link
Copy Markdown
Member

Thanks!

@snakefoot

snakefoot commented Jan 21, 2021

Copy link
Copy Markdown
Contributor Author

Slowly getting more and more difficult to perform these merges, as dev-branch has moved a lot :)

@304NotModified

Copy link
Copy Markdown
Member

Yes indeed, ideally master should be for bugfixes only.

@snakefoot snakefoot closed this Jan 21, 2021
@snakefoot snakefoot reopened this Jan 21, 2021
@sonarqubecloud

Copy link
Copy Markdown

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

84.8% 84.8% Coverage
0.0% 0.0% Duplication

@snakefoot
snakefoot merged commit 4dbc737 into NLog:dev Jan 21, 2021
@snakefoot

Copy link
Copy Markdown
Contributor Author

@304NotModified Think I pressed the wrong button on merge. Became a squash instead of merge. Should we "uncommit" and re-merge ?

@snakefoot snakefoot mentioned this pull request Jan 21, 2021
@304NotModified

304NotModified commented Jan 21, 2021

Copy link
Copy Markdown
Member

Yes please remove with force push. Then a new pr or a push from local. PR is slightly preferred

The "merge when passing" wasn't triggering?

@snakefoot

Copy link
Copy Markdown
Contributor Author

The "merge when passing" wasn't triggering?

No because the build-servers required "restart".

@snakefoot

snakefoot commented Jan 21, 2021

Copy link
Copy Markdown
Contributor Author

Yes please remove with force push.

Not sure I can force push against the dev-branch. Says "Cannot force-push to this protected branch"

@304NotModified

Copy link
Copy Markdown
Member

Ow yes force push is only for admin I guess, will do that

@304NotModified

304NotModified commented Jan 21, 2021

Copy link
Copy Markdown
Member

The squased commit (4dbc737) has been removed from dev and there is a new PR: #4259

@snakefoot
snakefoot deleted the merge477-to-dev branch July 30, 2022 10:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.