Skip to content

(DOC) Workflow details and instruction of fixing wrong files changed #41

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
Merged
huluoyang merged 2 commits into from
Jul 30, 2018
Merged

(DOC) Workflow details and instruction of fixing wrong files changed #41

huluoyang merged 2 commits into from
Jul 30, 2018

Conversation

@S1ngS1ng
Copy link
Contributor

@S1ngS1ng S1ngS1ng commented Jul 30, 2018

  • Add a reminder of "DO NOT COMMIT" in git rebase workflow
  • Instruction on how to create new branch based off current branch w/ wrong files changed
  • Add workflow explanation, just for reference

@S1ngS1ng S1ngS1ng added the ready for review Use when a translation (?) PR is ready for review label Jul 30, 2018
@S1ngS1ng S1ngS1ng requested review from huluoyang and wudifeixue July 30, 2018 20:08
wudifeixue
wudifeixue suggested changes Jul 30, 2018
View reviewed changes
Copy link

@wudifeixue wudifeixue left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

其他都没啥问题。

CONTRIBUTING.md Outdated

然后你继续翻译，并 `commit` 了代码，现在你的 `my-translate` 分支就是 `A -> B -> X -> M -> Y`，其中 `Y` 是你的最新 commit。

这时候你执行了 `git pull --rebase`，那么问题来了。基于 `rebase` 命令的比较原理（或者说算法），它会首先寻找一个你的 `my-translate` 分支与 `upstream/translate` 分支共同的”祖先 commit“（ancestor commit）。”共同的祖先 commit“（common ancestor commit）是指这两个分支**开始出现分歧（diverted）之前的那个 commit**。在这个例子中，它就会找到 commit `B`，因为在 `B` 之后，`my-transalte` 分支是 commit `X`，而 `upstream/translate` 是 commit `C`。
Copy link

@wudifeixue wudifeixue Jul 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

translate typo 😄

@huluoyang
Copy link
Contributor

huluoyang commented Jul 30, 2018

星星是 git 之神啊，速度 merge。^_^

@huluoyang huluoyang merged commit 9c4fd2f into translate Jul 30, 2018
SSShooter pushed a commit to SSShooter/challenges that referenced this pull request Sep 7, 2018
@S1ngS1ng @SSShooter
(DOC) Workflow details and instruction of fixing wrong files changed (F…
0d5a25c 
…reeCodeCampChina#41)

* Add instruction of new PR based off current branch and explanation of rebase workflow

* Fix typo
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@huluoyang huluoyang Awaiting requested review from huluoyang

1 more reviewer

@wudifeixue wudifeixue wudifeixue requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

ready for review Use when a translation (?) PR is ready for review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@S1ngS1ng @huluoyang @wudifeixue