Skip to content

docs: Add fork synchronization step to workflow#192

Merged
rdmueller merged 1 commit intodocToolchain:mainfrom
raifdmueller:docs/add-fork-sync-workflow
Jan 26, 2026
Merged

docs: Add fork synchronization step to workflow#192
rdmueller merged 1 commit intodocToolchain:mainfrom
raifdmueller:docs/add-fork-sync-workflow

Conversation

@raifdmueller
Copy link
Collaborator

Summary

Documents the fork synchronization step that should be performed after each PR merge to prevent duplicate commits and merge conflicts.

Changes

  • Added step 8 to workflow: Sync fork main with upstream/main after merge
  • Added important note: Always create feature branches from upstream/main, not from fork main

Why This Matters

Without fork synchronization:

  • Fork main diverges from upstream/main with duplicate commits (same changes, different hashes)
  • Future PRs contain commits already merged to upstream
  • Git history becomes messy with merge conflicts
  • "This branch cannot be rebased" errors occur

With proper synchronization:

  • Fork main stays in sync with upstream/main
  • Feature branches have clean, linear history
  • PRs only contain relevant new changes
  • Git workflow stays clean and predictable

Example

This PR follows the new workflow:

  1. Created from upstream/main (not fork main)
  2. Contains only the documentation change
  3. After merge, fork main will be synchronized

🤖 Generated with Claude Code

After each merge to upstream/main, the fork main should be synchronized
to prevent duplicate commits and merge conflicts in future PRs.

Always create feature branches from upstream/main, not from fork main,
to ensure clean, linear history.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
@rdmueller rdmueller merged commit 8ca6a4d into docToolchain:main Jan 26, 2026
4 checks passed
@raifdmueller raifdmueller deleted the docs/add-fork-sync-workflow branch January 26, 2026 19:07
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.

2 participants