Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Scheduled upward merges for numbered branches in wazuh-indexer repository - Fortnight #7 #195

Closed
2 tasks done
davidjiglesias opened this issue Apr 1, 2024 · 1 comment
Closed
2 tasks done

Scheduled upward merges for numbered branches in wazuh-indexer repository - Fortnight #7 #195

davidjiglesias opened this issue Apr 1, 2024 · 1 comment
Labels
level/subtask Subtask issue request/operational Operational requests type/maintenance Maintenance issue

Comments

@davidjiglesias
Copy link
Member

davidjiglesias commented Apr 1, 2024 •
edited by AlexRuiz7
Loading

Description

The goal is to complete the following tasks, each task must have a PR associated with this issue.

The branches must follow the naming: merge-<ORIGIN_BRANCH>-into-<DESTINATION_BRANCH>. For example, merge-4.8.0-into-4.8.1.

Tasks

4.8.0

  • Update changelog.
  • Merge branch 4.8.0 into branch 4.8.1.

4.8.1

  • Update changelog.
  • Merge branch 4.8.1 into branch 4.8.2.

4.8.2

  • Update changelog.
  • Merge branch 4.8.2 into branch 4.9.0.

4.9.0

  • Update changelog.
  • Merge branch 4.9.0 into branch master.

5.0.0 (master)

  • Update changelog.
@davidjiglesias davidjiglesias added level/subtask Subtask issue request/operational Operational requests type/maintenance Maintenance issue labels Apr 1, 2024
@davidjiglesias davidjiglesias mentioned this issue Apr 1, 2024
Closed
10 tasks
@AlexRuiz7
Copy link
Member

AlexRuiz7 commented Apr 1, 2024 •
edited
Loading

Forks work different and merge is not possible due to unrelated Git histories. We need to regenerate (overwrite) the master branch from the 4.9.0 branch. Only @gdiazlo is allowed to perform such changes.

@AlexRuiz7 AlexRuiz7 mentioned this issue Apr 1, 2024
Closed
8 tasks
@AlexRuiz7 AlexRuiz7 linked a pull request Apr 1, 2024 that will close this issue
Merge 4.9 into master #196
Closed
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
level/subtask Subtask issue request/operational Operational requests type/maintenance Maintenance issue
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Merge 4.9 into master wazuh/wazuh-indexer
2 participants
@AlexRuiz7 @davidjiglesias