Skip to content

bug: main branch ahead of Dev_new_gui (reversed branching discipline) #4113

Closed

Description

@mrveiss

Problem: main was 4 commits ahead of Dev_new_gui, opposite of intended structure

Commits on main (not on Dev_new_gui):

Expected Structure:

  • Dev_new_gui = active development (ahead)
  • main = stable release (behind)

Actual Structure:

  • main ahead of Dev_new_gui (wrong)

Root Cause: Unknown - commits went to wrong branch

Impact:

  • Critical fixes not on Dev_new_gui
  • Branching discipline broken
  • Risk of release/dev divergence

Fix Applied: Merged main into Dev_new_gui to preserve all changes

Prevention Needed:

  • Branch protection rules?
  • Commit hooks to enforce target branch?
  • Process documentation?

Activity

  1. mrveiss commented on Apr 13, 2026

    @mrveiss
    OwnerAuthor

    ✅ Closed with proof of implementation

    Commit: b495f729d (merged to Dev_new_gui)

    Acceptance Criteria Met:

    • ✅ Pre-commit hook created to block commits on main/master branches
    • ✅ Hook properly integrated into .pre-commit-config.yaml
    • ✅ Documentation updated in CLAUDE.md with branching discipline section
    • ✅ Shell script syntax validated
    • ✅ All deployment standards met
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions