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

docs: update faq #6371

Merged
merged 5 commits into from
Oct 9, 2024
Merged

docs: update faq #6371

merged 5 commits into from
Oct 9, 2024

Conversation

resetsix
Copy link
Contributor

@resetsix resetsix commented Sep 28, 2024

更新v5官网文档。

内容包括:使用 Antv/g6 v5过程中可能会遇到的常见问题。

@resetsix resetsix changed the title Docs/update faq docs: update faq Sep 28, 2024
@Aarebecca
Copy link
Contributor

有点冲突,你可以 rebase 一下 docs/update-faq 这个分支

@resetsix
Copy link
Contributor Author

有点冲突,你可以 rebase 一下 docs/update-faq 这个分支

抱歉我不是很熟悉git冲突,不小心 merge 了冲突内容,你看怎么处理比较合适。直接合吗

@Aarebecca
Copy link
Contributor

Aarebecca commented Sep 30, 2024

有点冲突,你可以 rebase 一下 docs/update-faq 这个分支

抱歉我不是很熟悉git冲突,不小心 merge 了冲突内容,你看怎么处理比较合适。直接合吗

先同步最新代码,然后切到你的分支 rebase docs/update-faq 分支的代码

参考:https://community.appsmith.com/tutorial/hands-guide-git-rebase-resolving-conflicts

@resetsix
Copy link
Contributor Author

先同步最新代码,然后切到你的分支 rebase docs/update-faq 分支的代码

参考:https://community.appsmith.com/tutorial/hands-guide-git-rebase-resolving-conflicts

已经更新 PR 内容。你 review 下看看有没有什么问题

@Aarebecca
Copy link
Contributor

Aarebecca commented Sep 30, 2024

先同步最新代码,然后切到你的分支 rebase docs/update-faq 分支的代码
参考:https://community.appsmith.com/tutorial/hands-guide-git-rebase-resolving-conflicts

已经更新 PR 内容。你 review 下看看有没有什么问题

你的代码仍然存在冲突,应该是没有拉取最新代码导致的

image

@Aarebecca Aarebecca changed the base branch from docs/update-faq to v5 September 30, 2024 06:43
uhobnil and others added 3 commits October 1, 2024 09:21
* fix: target node position error when create edge

* fix: use getElementData api to get source node and update test case screenshots
Co-authored-by: antv <antv@antfin.com>
@resetsix
Copy link
Contributor Author

resetsix commented Oct 1, 2024

@Aarebecca 好了。

@Aarebecca Aarebecca changed the base branch from v5 to doc/temp October 9, 2024 07:21
@Aarebecca Aarebecca merged commit 9a7f163 into antvis:doc/temp Oct 9, 2024
3 checks passed
Aarebecca pushed a commit that referenced this pull request Oct 9, 2024
* docs: update Q&A

Co-authored-by: antv <antv@antfin.com>

---------

Co-authored-by: antv <antv@antfin.com>
Aarebecca added a commit that referenced this pull request Oct 9, 2024
* docs: update Q&A



---------

Co-authored-by: 一闪一闪亮晶晶 <resetsix223@gmail.com>
Co-authored-by: antv <antv@antfin.com>
@resetsix resetsix deleted the docs/update-faq branch October 9, 2024 08:10
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 this pull request may close these issues.

3 participants