Skip to content

Docs/fork and pull request guidelines#16

Merged
oskarszoon merged 10 commits into
bsv-blockchain:mainfrom
torrejonv:docs/fork-and-pull-request-guidelines
Oct 17, 2025
Merged

Docs/fork and pull request guidelines#16
oskarszoon merged 10 commits into
bsv-blockchain:mainfrom
torrejonv:docs/fork-and-pull-request-guidelines

Conversation

@torrejonv

Copy link
Copy Markdown
Contributor

No description provided.

- Add comprehensive guide for contributors on forking workflow
- Include step-by-step instructions with screenshots
- Update documentation index and navigation
- Configure markdownlint for fenced code blocks
Document standard git workflow for fork-based development including processes for pushing work (with upstream sync and conflict handling) and creating new branches from synced main.
Copilot AI review requested due to automatic review settings October 16, 2025 23:29

This comment was marked as outdated.

@oskarszoon

This comment was marked as outdated.

@claude

This comment was marked as outdated.

Comment thread CLAUDE.md Outdated
claude[bot]

This comment was marked as outdated.

Copilot AI review requested due to automatic review settings October 17, 2025 08:36

This comment was marked as outdated.

torrejonv and others added 4 commits October 17, 2025 13:15
Replace git pull with explicit fetch and merge/reset commands for better clarity and control in fork workflow documentation.
…rrejonv/teranode into docs/fork-and-pull-request-guidelines
Copilot AI review requested due to automatic review settings October 17, 2025 11:29

This comment was marked as outdated.

@torrejonv torrejonv requested a review from Copilot October 17, 2025 11:34

This comment was marked as outdated.

@torrejonv

This comment was marked as outdated.

1 similar comment
@oskarszoon

This comment was marked as outdated.

@claude

This comment was marked as outdated.

claude[bot]

This comment was marked as outdated.

Use git fetch + git reset --hard upstream/main consistently across all documentation to prevent merge commits and keep forks cleanly synced with upstream.
@oskarszoon

Copy link
Copy Markdown
Contributor

/claude-review

@claude

claude Bot commented Oct 17, 2025

Copy link
Copy Markdown
Contributor

Claude finished @oskarszoon's task —— View job


PR Review: Fork and Pull Request Guidelines (3rd Review)

Todo List:

  • Read CLAUDE.md to check for remaining git sync issues
  • Read forkAndPullRequestGuidelines.md to check for remaining issues
  • Check previous review comments and verify fixes
  • Post final review feedback

Status: All Issues Resolved ✓

All instances of git pull upstream main and git merge upstream/main have been successfully replaced with git reset --hard upstream/main. The documentation now consistently uses the correct approach throughout:

Fixed locations:

  • CLAUDE.md:204, 220 - Now use git reset --hard upstream/main
  • forkAndPullRequestGuidelines.md:235, 255, 286, 361, 373 - All updated

The fork workflow documentation is comprehensive and follows best practices. The tutorial provides excellent guidance with clear explanations, helpful screenshots, and a strong pre-commit hook to prevent accidental commits to main.

Ready to merge.


Job Run | Branch

@claude claude Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All git sync issues resolved. Documentation is comprehensive and follows best practices.

@oskarszoon oskarszoon merged commit fe91c18 into bsv-blockchain:main Oct 17, 2025
7 checks passed
@torrejonv torrejonv deleted the docs/fork-and-pull-request-guidelines branch October 25, 2025 18:47
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.

4 participants