Skip to content

Merging Develop into Main#200

Closed
amnad001 wants to merge 5 commits intomainfrom
develop
Closed

Merging Develop into Main#200
amnad001 wants to merge 5 commits intomainfrom
develop

Conversation

@amnad001
Copy link
Copy Markdown
Contributor

@amnad001 amnad001 commented Mar 4, 2026

No description provided.

Abdellah and others added 5 commits March 3, 2026 15:37
update: deleting the review dates
fdf66df
Revert "update: deleting the review dates"
18286f5 
This reverts commit fdf66df.
@amnad001
Update/deleting last dates (#199)
37ab551 
* update: deleting the review dates

* Revert "update: deleting the review dates"

This reverts commit fdf66df.

* Deleting the review dates

* Adding github copilot documentation

* Made the sidebar alfabatical

* Made it alphabetical

* Merge conflict

---------

Co-authored-by: Abdellah <abdellah11@live.nl>
Merge branch 'develop' of github.com:Amsterdam/ee-docs into develop
6731f1c
Deleted the test.yaml file
2a74f69
@amnad001 amnad001 requested a review from a team as a code owner March 4, 2026 16:25
@thomasm0
Copy link
Copy Markdown
Member

thomasm0 commented Mar 4, 2026

This project has a release flow, I usually forget this too 😛 I would close this PR, then

  1. From develop branch make a new branch release/260304 (you can do it all via github.com UI quickly or locally).
    This new branch triggers the release action.
  2. Then create a PR to merge this into main; the actions will run github pages deploy.
  3. Aaand finally after all this, create a PR to merge main into develop to prevent any annoying merge conflicts in the future.

For more info check out https://github.com/Amsterdam/ee-docs/blob/develop/internal-docs/generating-a-release.md

When generating a new release, a new branch release/[branch-name] should be created from develop. In GitHub this will trigger the [Release action](https://github.com/Amsterdam/ee-docs/blob/develop/.github/workflows), which will run Release it! Then the branch can be merged to main.
Don't forget to merge main back into develop when complete.

@amnad001 amnad001 closed this Mar 5, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@4c0n 4c0n 4c0n approved these changes

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@amnad001 @thomasm0 @4c0n