namcho/the-nexus
1
0
Fork 0
Code Issues 2 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Docs: Update Git workflow to follow Git Flow #4

Open
namcho wants to merge 1 commit from feature/issue-3 into develop
pull from: feature/issue-3
merge into: namcho:develop
Conversation 0 Commits 1 Files changed 2 +40 -3
namcho commented 2026-02-22 15:18:03 +01:00
Owner
Copy link

Closes #3

User Request:

Please follow git flow branching (main, develop, hotfix, bugfix, features, etc.). Do not overwhelm the main branch. We are going to use mainbranch for production version of the web-page... Update the Git Forgejo Workflow in AGENTS.md based on input given to you if an update/change is needed.

Main Agent Assessment:
Categorized as: Documentation/Process
Delegated to: @lead-engineer

Changes Made:

  • Updated AGENTS.md to replace the generic issue-driven workflow with a strict Git Flow architecture.
  • Defined branching strategy (main, develop, feature/*, bugfix/*, hotfix/*).
  • Updated forgejo_tools.py to support dynamically passing the base branch so PRs target develop by default.
Closes #3 **User Request:** > Please follow git flow branching (main, develop, hotfix, bugfix, features, etc.). Do not overwhelm the main branch. We are going to use mainbranch for production version of the web-page... Update the Git Forgejo Workflow in AGENTS.md based on input given to you if an update/change is needed. **Main Agent Assessment:** Categorized as: `Documentation/Process` Delegated to: `@lead-engineer` **Changes Made:** * Updated `AGENTS.md` to replace the generic issue-driven workflow with a strict Git Flow architecture. * Defined branching strategy (`main`, `develop`, `feature/*`, `bugfix/*`, `hotfix/*`). * Updated `forgejo_tools.py` to support dynamically passing the base branch so PRs target `develop` by default.
This pull request has changes conflicting with the target branch.
  • AGENTS.md
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature/issue-3:feature/issue-3
git switch feature/issue-3

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch develop
git merge --no-ff feature/issue-3
git switch feature/issue-3
git rebase develop
git switch develop
git merge --ff-only feature/issue-3
git switch feature/issue-3
git rebase develop
git switch develop
git merge --no-ff feature/issue-3
git switch develop
git merge --squash feature/issue-3
git switch develop
git merge --ff-only feature/issue-3
git switch develop
git merge feature/issue-3
git push origin develop
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
namcho/the-nexus!4
No description provided.