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] zh-cn document translate: git parts #15576

Merged
merged 5 commits into from
Apr 22, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add doc tag version
Thanks!

Co-authored-by: peepeetee <[email protected]>
  • Loading branch information
epiciskandar and peepeetee committed Jan 23, 2022
commit 1b424d022372600dce214f792c2e67c5634d68bd
5 changes: 5 additions & 0 deletions docs/zh-cn/newbs_git_best_practices.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# QMK所采用的Git最佳实践

epiciskandar marked this conversation as resolved.
Show resolved Hide resolved
<!---
original document: 0.15.12:docs/newbs_git_best_practices.md
git diff 0.15.12 HEAD -- docs/newbs_git_best_practices.md | cat
epiciskandar marked this conversation as resolved.
Show resolved Hide resolved
-->

*译者注:对于git相关的部分,除广为接受的名词外,会尽量保留git命令及各种术语的英文版本,部分名词及关键部分会附带中文翻译*

## 或者讲,"怎么才能不害怕并喜欢上Git"
Expand Down
5 changes: 5 additions & 0 deletions docs/zh-cn/newbs_git_resolving_merge_conflicts.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# 解决合并冲突

epiciskandar marked this conversation as resolved.
Show resolved Hide resolved
<!---
original document: 0.15.12:docs/newbs_git_resolving_merge_conflicts.md
git diff 0.15.12 HEAD -- docs/newbs_git_resolving_merge_conflicts.md | cat
epiciskandar marked this conversation as resolved.
Show resolved Hide resolved
-->

有时在你致力于一个较长周期才能完成的分支时,其它人提交的变更会与你提交的pull request中的变更发生冲突。我们将这种多个人编辑同一个模块同一个文件时产生的场景叫做 *合并冲突*

?> 本文中的场景基于[在你Fork的主干上:频繁更新,不要提交](zh-ch/newbs_git_using_your_master_branch.md)一文。如果你对那篇文章不熟悉,请先阅读它,再回来继续。
epiciskandar marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
5 changes: 5 additions & 0 deletions docs/zh-cn/newbs_git_resynchronize_a_branch.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# 重新同步已失去同步状态的Git分支

epiciskandar marked this conversation as resolved.
Show resolved Hide resolved
<!---
original document: 0.15.12:docs/newbs_git_resynchronize_a_branch.md
git diff 0.15.12 HEAD -- docs/newbs_git_resynchronize_a_branch.md | cat
epiciskandar marked this conversation as resolved.
Show resolved Hide resolved
-->

假设你在自己的 `master` 分支之上有提交,并且想和QMK仓库进行同步,可以通过 `git pull` 拉取QMK的 `master` 分支到你的库,但同时Github也会提醒你当前分支相比 `qmk:master` 有几个领先的提交,会在你向QMK发起pr时造成麻烦。

?> 本文中的场景基于[在你Fork的主干上:频繁更新,不要提交](zh-ch/newbs_git_using_your_master_branch.md)一文。如果你对那篇文章不熟悉,请先阅读它,再回来继续。
epiciskandar marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
5 changes: 5 additions & 0 deletions docs/zh-cn/newbs_git_using_your_master_branch.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# 在你Fork的主干上:频繁更新,不要提交

epiciskandar marked this conversation as resolved.
Show resolved Hide resolved
<!---
original document: 0.15.12:docs/newbs_git_using_your_master_branch.md
git diff 0.15.12 HEAD -- docs/newbs_git_using_your_master_branch.md | cat
epiciskandar marked this conversation as resolved.
Show resolved Hide resolved
-->

我们强烈推荐所有QMK开发者,无论在哪里做什么改动,频繁更新你的 `master` 分支,但***不要***在其上提交。相对地,将你所有的改动提交到开发分支上并提交一个pull request。

为了减少冲突 &mdash; 多人同时编辑同一个文件 &mdash; 保持你的 `master` 分支更新到最新,并在新创建的分支上进行开发。
Expand Down