diff --git a/README.md b/README.md index 21a315b..446ffd0 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,10 @@ - 从 github 自己的项目中对上游项目发起合并请求 (Pull Request)。 - PR 被上游仓库开发者审核、测试,最终合并。 +### 保持fork的仓库以及本地仓库与原仓库一致 +- 获取原仓库 git fetch upstream +- 将本地仓库同步到与原仓库一致 git merge upstream/master +- 将本地仓库push到自己fork的仓库 git push origin master ### 参考资料 diff --git a/lesson2/.idea/gradle.xml b/lesson2/.idea/gradle.xml deleted file mode 100644 index 02e891c..0000000 --- a/lesson2/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/lesson2/.idea/misc.xml b/lesson2/.idea/misc.xml index bc8d0a3..28a804d 100644 --- a/lesson2/.idea/misc.xml +++ b/lesson2/.idea/misc.xml @@ -1,7 +1,6 @@ - - - + + \ No newline at end of file diff --git a/lesson2/.idea/modules.xml b/lesson2/.idea/modules.xml new file mode 100644 index 0000000..7d7f18f --- /dev/null +++ b/lesson2/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/lesson2/.idea/workspace.xml b/lesson2/.idea/workspace.xml index 7d22b6a..beb7bd7 100644 --- a/lesson2/.idea/workspace.xml +++ b/lesson2/.idea/workspace.xml @@ -2,8 +2,9 @@ - - + + + @@ -142,23 +143,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + - - + + @@ -177,390 +201,21 @@ - - - @@ -573,6 +228,7 @@ @@ -583,10 +239,10 @@ DEFINITION_ORDER - @@ -610,64 +266,97 @@ - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + - +