- From: himorin / Atsushi Shimono via GitHub <sysbot+gh@w3.org>
- Date: Wed, 17 Aug 2022 14:07:58 +0000
- To: public-i18n-archive@w3.org
> That's normal, as I need to resolve the merge conflicts. Those modifications are already in the `gh-pages` branch. In addition, some more explanation. When some branch is created at 100th history of HEAD, and bunch of updates are committed to HEAD during discussion held in PR of the branch - like 170th HEAD, the branch is ahead of HEAD over 70 commits. If there is conflict(s) between PR and ones during 70 commits, conflicted file(s) are required to be resolved. For this, [there are several ways](https://www.atlassian.com/git/tutorials/merging-vs-rebasing), like: - take updates between 100th and 170th HEAD, per file which is modified within the PR (named as `resolve conflict` button on merging) - just rebase from 100th to 170th HEAD, like modify history of PR from '100th HEAD -> commit for PR' to '170th HEAD -> commit for PR', which results to modify the PR as started from 170th HEAD - merge from origin/HEAD to the PR, which applies all modification happened on HEAD, like taking all commits between 100th and 170th into the PR (history will be `100th HEAD -> commit for PR -> all changes between 100-170`) For the last, commit for merging all changes (e.g. 100th to 170th in example above) will be shown lie ac0a810, but `Files changed` tab in PR will show will show only changes between 170th HEAD and the PR which is similar to the original change for the PR. -- GitHub Notification of comment by himorin Please view or discuss this issue at https://github.com/w3c/i18n-drafts/pull/327#issuecomment-1218060348 using your GitHub account -- Sent via github-notify-ml as configured in https://github.com/w3c/github-notify-ml-config
Received on Wednesday, 17 August 2022 14:08:00 UTC