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.

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

[release-1.22] docs: break apart the ambient getting start guide (WIP) #15332

Closed
istio-testing opened this issue Jun 26, 2024 · 1 comment · Fixed by #15346
Closed

[release-1.22] docs: break apart the ambient getting start guide (WIP) #15332

istio-testing opened this issue Jun 26, 2024 · 1 comment · Fixed by #15346
Assignees

Comments

@istio-testing
Copy link
Contributor

Manual cherrypick required.

#15168 failed to apply on top of branch "release-1.22":

Applying: break apart the ambient getting start guide
Applying: wip
Applying: wip
Applying: fix linter issues
Applying: wip
Applying: add tests
Applying: Craig's first edits
Applying: lint fixes
Applying: Fix tests
Applying: fix tests
Applying: test for #15200 workaround
Applying: fix tests (thanks Faseela for helping me get them running locally!)
Applying: Fix the snip generator?
Applying: remove Wasm test because it depends on snips we're moving around
Using index info to reconstruct a base tree...
M	content/en/docs/ambient/usage/extend-waypoint-wasm/index.md
M	go.mod
Falling back to patching base and 3-way merge...
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging content/en/docs/ambient/usage/extend-waypoint-wasm/index.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0014 remove Wasm test because it depends on snips we're moving around
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

@zirain
Copy link
Member

zirain commented Jul 2, 2024

fxied by #15346

@zirain zirain closed this as completed Jul 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants