Resolve merge conflicts with master for README update PR#280
Draft
Resolve merge conflicts with master for README update PR#280
Conversation
- Fix Node.js version prerequisite (16 → 18 to match package.json) - Fix NPM version badge alt text - Add Configuration section with client options and env vars - Modernize code examples (var → const) - Add update, list, AppRole auth, error handling, and custom commands docs - Fix bastion host example for axios (rpOptions → requestOptions) - Add TypeScript support mention - Remove outdated year reference and unused link references Co-authored-by: aviadhahami <7353632+aviadhahami@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Update README file with current codebase information
Update README to reflect current codebase
Mar 10, 2026
- Build Status: use workflow-specific shield (github/actions/workflow/status) instead of generic checks-status, link directly to lint-and-test workflow - Remove Codecov badge: upload is commented out in CI, badge was stale - Add License badge (MIT) - Fix docker-compose link: old URL returns 404, now points to docs.docker.com/compose/ - Fix docker link: http → https Co-authored-by: aviadhahami <7353632+aviadhahami@users.noreply.github.com>
Copilot
AI
changed the title
Update README to reflect current codebase
Update README badges and fix broken links
Mar 11, 2026
aviadhahami
approved these changes
Mar 12, 2026
Resolve README.md conflict in bastion host section by keeping the modernized destructured SocksProxyAgent import with axios-style agent config. Incorporate master's new Custom SSL/TLS Configuration section, pass_request_options example updates, requestOptions forwarding tests, and version bump to 0.10.10. Co-authored-by: aviadhahami <7353632+aviadhahami@users.noreply.github.com>
…me-content # Conflicts: # README.md
Copilot
AI
changed the title
Update README badges and fix broken links
Resolve merge conflicts with master for README update PR
Mar 12, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The previous merge attempt produced a commit with a single parent instead of a proper merge commit, so GitHub continued reporting conflicts against master.
Changes
origin/masterwith two parents (00a68d5,6681879) so Git recognizes the shared historyendpoint,token,agentOptions) over the stale bastion-host leftover snippetOriginal PR content (unchanged)
checks-status→actions/workflow/status, removed stale Codecov badge, added License badge[docker toolbox]refvar→const, fixed Kubernetes/bastion examples, added Configuration/AppRole/error-handling sections🔒 GitHub Advanced Security automatically protects Copilot coding agent pull requests. You can protect all pull requests by enabling Advanced Security for your repositories. Learn more about Advanced Security.