chore: remove dev branch direct-push protection from hooks and update…#137
Merged
chore: remove dev branch direct-push protection from hooks and update…#137
Conversation
… docs
- Removed PROTECTION RULE 2 (exact 'dev' block) from .git-hooks/pre-push
- Updated post-checkout/post-merge: removed 'dev' from protected-branch list in messages
- Updated .githooks-template/ to match
- Updated docs: CONTRIBUTING.md, START_HERE.md, COMPLETE_SETUP.md, README.md,
FIND_YOUR_TASKS.md, docs/DOCUMENTATION_INDEX.md
- Updated all 6 team onboarding docs under docs/onboarding/
- Updated all 8 team_dev_environments READMEs
- Updated all team_submodule_commands docs and setup-hooks.sh scripts
- Updated scripts: auto-install-hooks.sh, install-all-git-hooks.sh,
install-hooks-service.sh, sync-hooks-to-submodules.sh,
sync-hooks-to-submodules-now.sh, setup-hooks.sh
Protected branches are now: main, master, and branches containing 'team-dev'
dev is now an open integration branch/push freely, use PRs to merge
ChrisWoo0443
suggested changes
Mar 18, 2026
Contributor
ChrisWoo0443
left a comment
ChrisWoo0443
left a comment
There was a problem hiding this comment.
Please fix merge conflicts
Other than that LGTM
Merge dev into main
refactor: extract ollama pre-pull logic into separate script under op…
- get_dirty_submodules: Refactored to use ThreadPoolExecutor for parallel processing - _check_submodule_dirty: Added helper function for submodule checks - _get_http_client: Added cached AsyncClient for HTTP requests
- lru_cache: Added to `get_merge_base` function for memoization. - _http_client: Introduced a global async httpx client with connection limits and caching logic in `_get_http_client`. - send_to_ollama, get_ollama_models: Updated to use the cached HTTP client instead of creating a new one per request. - _build_file_context: Added function to provide context for file merging based on file type and format. - resolve_file_with_context: Refactored to parallelize git calls using asyncio.to_thread and gather results.
Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>
Member
|
@SeanSan06 Could you fix these merge conflicts? |
- Added ".opencode" entry to .gitignore to ignore generated files from the opencode tool
['- Introduced a new parameter `max_chars` in `_truncate_diff_for_commit_analysis` function for dynamic character limit adjustment.', '- Added conditions to use simple path when file count is <= AI_COMMIT_SIMPLE_MAX_FILES and no merge conflict markers are present.', '- Updated environment variable handling for performance tuning options.']
- Add function _normalise_commit_body to handle different types of input for the commit body. - Add function _commit_body_lines which uses _normalise_commit_body and splits the body into lines. - Update _normalise_commits_from_parsed and generate_pr_description functions to use _commit_body_lines.
- Updated the DESCRIPTION section instructions for clarity. - Added detailed TESTING main and extra sections. - Ensured clear guidance on how to verify changes locally.
- Added --full-auto and --full options for automated workflow. - Updated error handling for failed checkouts. - Improved branch selection feedback.
- Adjust OLLAMA_COMMIT_NUM_PREDICT default to 576 tokens - Retain other performance-related environment variables unchanged
Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>
Joe black/feature/ai conflict
Member
|
@SeanSan06 use the ai-conflict.py conflict resolution tool in the platform/scripts/git |
Member
Author
Sounds good I will handle this today |
…resolve conflicts
Member
Author
|
@jrb00013 Merge conflicts have been handled |
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
5 participants
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.
Description(WIP, fixing merge conflicts)
This message last updated: 3/13/2026 10:48 pm
Removes the direct-push block on the
devbranch from all git hooks and updates every doc, script, and onboarding file that referenceddevas a protected branch.Previously,
devwas blocked alongsidemainandmasterin thepre-pushhook, preventing developers from pushing directly to it.devis an integration branch — it should accept direct pushes and be merged into via PRs from feature branches. Onlymainandmasterbranches need push protection.Changes
PROTECTION RULE 2(exactdevblock) from.git-hooks/pre-pushand.githooks-template/pre-pushpost-checkoutandpost-mergehook messages: removeddevfrom the listed protected branchesdocs/CONTRIBUTING.md,START_HERE.md,COMPLETE_SETUP.md,README.md,FIND_YOUR_TASKS.md,docs/DOCUMENTATION_INDEX.mddocs/onboarding/team_dev_environments/READMEsteam_submodule_commands/docs andsetup-hooks.shscriptsauto-install-hooks.sh,install-all-git-hooks.sh,install-hooks-service.sh,sync-hooks-to-submodules.sh,sync-hooks-to-submodules-now.sh,setup-hooks.shProtected branches are now:
mainandmasterRelated
Testing
Important Notes (Optional)
deepiri-landing,deepiri-emotion-desktop,deepiri-notideepare not in this workspace and will need separate PRsWorkflow Checklist (Required)
chore:)Review Requests
@Team-Deepiri/support-team