From b403e1c3b4d854683bf001e2a7b0d3d78125f299 Mon Sep 17 00:00:00 2001 From: xushanpu123 <50659045+xushanpu123@users.noreply.github.com> Date: Sun, 3 Jul 2022 10:13:55 +0000 Subject: [PATCH 1/2] QA.md --- QA.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 QA.md diff --git a/QA.md b/QA.md new file mode 100644 index 0000000..c1e1513 --- /dev/null +++ b/QA.md @@ -0,0 +1,21 @@ +Q1:已经在classroom中建立了自己的仓库(例如 “LearningOS/lab0-0-setup-env-run-os1-chyyuu2022"),但是源仓库“LearningOS/rust-based-os-comp2022“更新了,如何处理? + +A: + +**方法一:** + +​ 向管理员“助教许善朴”申请删除已生成仓库,再点击 链接重新创建仓库。 + +**方法二:** + +​ 在自己构建的仓库根目录下执行以下命令: + +```makefile +git remote add upstream "https://github.com/LearningOS/rust-based-os-comp2022.git" +git fetch upstream +git checkout -b foo +git branch -D main +git checkout -t upstream/main +git reset --hard origin/main +git push -f +``` \ No newline at end of file From 3f633536d1e3540f340e9cf1896f713d24ace401 Mon Sep 17 00:00:00 2001 From: xushanpu123 <798304030@qq.com> Date: Sun, 3 Jul 2022 18:16:32 +0800 Subject: [PATCH 2/2] --- QA.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/QA.md b/QA.md index c1e1513..83e3f43 100644 --- a/QA.md +++ b/QA.md @@ -18,4 +18,5 @@ git branch -D main git checkout -t upstream/main git reset --hard origin/main git push -f -``` \ No newline at end of file +``` +