Rebasing dev-tr on top of main (manually) #3561
Closed
Conversation
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
Signed-off-by: Sergey Krymov <[email protected]> Signed-off-by: Sergey Krymov <[email protected]> Signed-off-by: Timur Tukaev <[email protected]> Co-authored-by: Dmitry Shurupov <[email protected]> Co-authored-by: Timur Tukaev <[email protected]> Co-authored-by: Kirill Kononovich <[email protected]>
Signed-off-by: ARYAN <[email protected]> Signed-off-by: Anuj Tiwari <[email protected]> Signed-off-by: Bishal Das <[email protected]> Co-authored-by: Anuj Tiwari <[email protected]> Co-authored-by: Bishal Das <[email protected]>
Fixed broken link Signed-off-by: Mohit Bisht <[email protected]>
Signed-off-by: Sully M <[email protected]> Signed-off-by: Sully Martinez <[email protected]> Signed-off-by: Sully Martinez <[email protected]> Co-authored-by: Victor Morales <[email protected]> Co-authored-by: Jossemar Cordero <[email protected]>
…3174) Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Patrice Chalin <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: EnriqueTejeda <[email protected]> Signed-off-by: Enrique Tejeda <[email protected]> Co-authored-by: Jossemar Cordero <[email protected]>
Signed-off-by: Sully Martinez <[email protected]> Co-authored-by: Victor Morales <[email protected]>
Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 5 to 6. - [Release notes](https://github.com/dawidd6/action-download-artifact/releases) - [Commits](dawidd6/action-download-artifact@v5...v6) --- updated-dependencies: - dependency-name: dawidd6/action-download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [rojopolis/spellcheck-github-actions](https://github.com/rojopolis/spellcheck-github-actions) from 0.37.0 to 0.38.0. - [Release notes](https://github.com/rojopolis/spellcheck-github-actions/releases) - [Changelog](https://github.com/rojopolis/spellcheck-github-actions/blob/master/CHANGELOG.md) - [Commits](rojopolis/spellcheck-github-actions@0.37.0...0.38.0) --- updated-dependencies: - dependency-name: rojopolis/spellcheck-github-actions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Junya Okabe <[email protected]>
[ja] Merge main into dev-ja to sync-up
Signed-off-by: Chris Abraham <[email protected]>
Don't store search increments in the browser history
…polis/spellcheck-github-actions-0.38.0 Bump rojopolis/spellcheck-github-actions from 0.37.0 to 0.38.0
Signed-off-by: Sebastien Aucouturier <[email protected]>
Signed-off-by: Nitish Rawat <[email protected]> Signed-off-by: Noah Ispas <[email protected]> Co-authored-by: Noah Ispas <[email protected]>
Signed-off-by: Arun Karthick N M <[email protected]> Signed-off-by: Catherine Paganini <[email protected]> Signed-off-by: Noah Ispas <[email protected]> Signed-off-by: Nate W <[email protected]> Signed-off-by: Seokho Son <[email protected]> Co-authored-by: Catherine Paganini <[email protected]> Co-authored-by: Seokho Son <[email protected]> Co-authored-by: Noah Ispas <[email protected]> Co-authored-by: Hilliary Lipsig <[email protected]> Co-authored-by: Nate W <[email protected]>
Signed-off-by: Junya Okabe <[email protected]>
…dd6/action-download-artifact-6 Bump dawidd6/action-download-artifact from 5 to 6
[es] Merge main into dev-es
Signed-off-by: Kirill Kononovich <[email protected]>
Signed-off-by: Rodolfo Martínez Vega <[email protected]>
Signed-off-by: Stéphane Este-Gracias <[email protected]>
Signed-off-by: Patrice Chalin <[email protected]>
Signed-off-by: Guillaume Bernard <[email protected]>
✅ Deploy Preview for cncfglossary ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
github-actions
bot
added
lang/en
github-project-automation
bot
moved this to 📋 Backlog
in CNCF glossary definition review board
aliok
changed the title
|
I manually rebased Thanks! Once this is merged, I will create another PR to merge the (Not sure if I would've been able to pull it off by simply merging current |
canogluonur
approved these changes
Sep 11, 2025
mertssmnoglu
approved these changes
Sep 11, 2025
|
@nate-double-u @seokho-son what do you think? |
|
I'm OK with merging this based on what you're trying to do. Do you need it done 'merge commit' style? |
|
Hi @aliok, I think using dev-tr...main is the preferred way to update the dev-tr branch. This is because we can easily trust the commits included in this PR, and no additional review is required between upstream branches. Additionally, main...dev-tr also looks fine. |
|
Closing in favor of #3575 3575 |
github-project-automation
bot
moved this from 📋 Backlog
to ✅ Done
in CNCF glossary definition review board
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
56 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.
Describe your changes
Related issue number or link (ex:
resolves #issue-number)Checklist before opening this PR (put
xin the checkboxes)git commit -s) is to affirm that commits comply DCO. If you are working locally, you could add an alias to yourgitconfigby runninggit config --global alias.ci "commit -s".