Skip to content

translating svg-inline-loader #1056

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

Closed
wants to merge 0 commits into from
Closed

translating svg-inline-loader #1056

wants to merge 0 commits into from

Conversation

KimYangOfCat
Copy link
Member

translated svg-inline-loader

  • Read and sign the CLA. PRs that haven't signed it won't be accepted.
  • Make sure your PR complies with the writer's guide.
  • Review the diff carefully as sometimes this can reveal issues.
  • Do not abandon your Pull Request: Stale Pull Requests.
  • Remove these instructions from your PR as they are for your eyes only.

@QC-L
Copy link
Member

QC-L commented Apr 17, 2021

分支不对,带了冗余的东西。

@KimYangOfCat
Copy link
Member Author

分支不对,带了冗余的东西。

抱歉,对于这些冗余的东西,我也不知道怎么出来的。
我能想到的解决方法是,关闭本PR,然后删除我fork的仓库,然后重新fork,再重新修改并commit,最后重新提交PR,但这样的方法对我fork的仓库太具备破坏性。
所以,想请问您,是否有更好解决方法?感谢~

@QC-L
Copy link
Member

QC-L commented Apr 18, 2021

具体流程在 #749,先改翻译吧

@KimYangOfCat
Copy link
Member Author

具体流程在 #749,先改翻译吧

我明白了,应该是我在翻译前没有新建翻译分支导致的这些冗余内容,感谢提示,非常抱歉翻译前没有了解清楚翻译流程。
那我尝试回滚到上一次翻译的commit,然后重新新建翻译分支,重新修改吧。但是我有一个问题,我不清楚 PR 是否能追踪新建的翻译分支的修改信息,因为在提交 PR 的时候,有选定合并 cn 分支,故我认为此 PR只能追踪目前这个 cn 分支修改的信息,不能追踪我新建分支的修改信息。那么此PR是否需要关闭?新建翻译分支修改之后再重新使用新的翻译分支提交PR?
或者我以上的分析都是错误的?冗余内容产生的原因并不是来自于此。

@QC-L
Copy link
Member

QC-L commented Apr 20, 2021

你把 PR 理解为特殊的分支,因为在合并提交时,我会压缩 PR 提交的内容(简单理解就是改了 commit 的 hash),这样你原来的翻译与合并的翻译并不会被认为是相同的提交,所以就产生了冗余。

新建分支的目的是与 cn 同步,保证你翻译时,内容与 cn 分支一致。

回到你的问题,新建个分支,提交 pr 不会影响现有,相当于新建了两个分支。

@KimYangOfCat
Copy link
Member Author

KimYangOfCat commented Apr 20, 2021

@QC-L 感谢您的解答,我理解了,新修改的内容已通过新的 PR 提交,敬请斧正。

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