Skip to content

task9: posuihushui #1328

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

task9: posuihushui #1328

wants to merge 4 commits into from

Conversation

posuihushui
Copy link
Contributor

No description provided.

Copy link
Member

@ourai ourai left a comment

Choose a reason for hiding this comment

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

由于该 PR 与 #1327 有 3 个相同提交,若合并可能会造成把已合并的 task 8 文件删除,所以请按下列步骤操作:

  1. 在你本地仓库切到 task9 分支,把 task 9 相关文件复制到仓库外临时保存;
  2. 把分支代码 hard reset 到 e44c069 这次提交;
  3. force push 到远程仓库;
  4. 远程仓库切换到 task9 分支后同步上游仓库代码;
  5. 本地仓库 pull 远程仓库代码;
  6. 把临时存在仓库外的 task 9 相关文件移动回原来位置;
  7. 提交并 push 到远程仓库。

@ourai ourai self-assigned this Aug 1, 2024
@ourai ourai added invalid This doesn't seem right bug Something isn't working and removed invalid This doesn't seem right labels Aug 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants