Fix weird merge error with previous PR. by jdmarshall · Pull Request #884 · node-config/node-config · GitHub
Skip to content

Fix weird merge error with previous PR.#884

Merged
jdmarshall merged 1 commit into
node-config:masterfrom
jdmarshall:rawFix
Feb 17, 2026
Merged

Fix weird merge error with previous PR.#884
jdmarshall merged 1 commit into
node-config:masterfrom
jdmarshall:rawFix

Conversation

@jdmarshall

@jdmarshall jdmarshall commented Feb 17, 2026

Copy link
Copy Markdown
Collaborator

It looks like I didn't rebase, and I'm not entirely sure why this didn't fail before the branch was merged. I'll need to look at that more.

Summary by CodeRabbit

  • Chores
    • Internal code reorganization with no impact on user-facing features or functionality.

@coderabbitai

coderabbitai Bot commented Feb 17, 2026

Copy link
Copy Markdown

@jdmarshall jdmarshall merged commit 8f552b4 into node-config:master Feb 17, 2026
1 check passed
@jdmarshall jdmarshall deleted the rawFix branch February 26, 2026 01:06
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

Successfully merging this pull request may close these issues.

1 participant