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

Fix merge errors caused by parallel development #127

Closed
Pil0tXia opened this issue Aug 28, 2023 · 0 comments · Fixed by #128
Closed

Fix merge errors caused by parallel development #127

Pil0tXia opened this issue Aug 28, 2023 · 0 comments · Fixed by #128

Comments

@Pil0tXia
Copy link
Member

#120 and #125 are two branches developed in parallel. Therefore, when merging, special handling is required. It's not sufficient to simply merge master into #125. Instead, a new branch should be created from master and the existing #125 branch should be merged into this new branch.
@Pil0tXia Pil0tXia mentioned this issue Aug 28, 2023
Merged
xwm1992 pushed a commit that referenced this issue Aug 28, 2023
@Pil0tXia
[ISSUE #127] Fix parallel development merge conflict and optimize doc…
4f15235 
…uments (#128)

* Fix failed task and image duplicate references (zh-cn)

* Fix image relative link references (en)

* sync versioned doc change

* resolve confict: remove mis-recognized as moved file

* resolve conflict: translate a doc to manually make git change

* feat: translate HTTPS doc

* sync image relative link

* unify 1.9.0 version label

* Fix mandatory values were labeled as optional in webhook docs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

[ISSUE #127] Fix parallel development merge conflict and optimize documents Pil0tXia/eventmesh-site
1 participant
@Pil0tXia