From ae04ea012e1bc8ac25ebb4b57bda4aee192ee0de Mon Sep 17 00:00:00 2001 From: jinyangshuo <15612919020@163.com> Date: Fri, 11 Oct 2024 09:38:51 +0800 Subject: [PATCH 1/3] Add README_jinyangshuo.md --- README_jinyangshuo.md | 1 + "\345\255\231\344\272\232\346\243\256hello world.py" | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 README_jinyangshuo.md delete mode 100644 "\345\255\231\344\272\232\346\243\256hello world.py" diff --git a/README_jinyangshuo.md b/README_jinyangshuo.md new file mode 100644 index 0000000..d74e52a --- /dev/null +++ b/README_jinyangshuo.md @@ -0,0 +1 @@ +Hello,jinyangshuo \ No newline at end of file diff --git "a/\345\255\231\344\272\232\346\243\256hello world.py" "b/\345\255\231\344\272\232\346\243\256hello world.py" deleted file mode 100644 index e75154b..0000000 --- "a/\345\255\231\344\272\232\346\243\256hello world.py" +++ /dev/null @@ -1 +0,0 @@ -print("hello world") \ No newline at end of file -- Gitee From 6acc1a63dcef227193ae3b328002bf8ae6e76ef2 Mon Sep 17 00:00:00 2001 From: jinyangshuo <15612919020@163.com> Date: Fri, 11 Oct 2024 09:41:38 +0800 Subject: [PATCH 2/3] Add README_jinyangshuo.md --- .idea/.gitignore | 3 +++ .idea/hello-git.iml | 8 ++++++++ .idea/inspectionProfiles/profiles_settings.xml | 6 ++++++ .idea/misc.xml | 4 ++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ 6 files changed, 35 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/hello-git.iml create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/hello-git.iml b/.idea/hello-git.iml new file mode 100644 index 0000000..d0876a7 --- /dev/null +++ b/.idea/hello-git.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..49170a2 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..e1b556b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file -- Gitee From 0c3433185981c638a15846720059501a60f4ad34 Mon Sep 17 00:00:00 2001 From: jinyangshuo <15612919020@163.com> Date: Sat, 19 Oct 2024 09:54:32 +0800 Subject: [PATCH 3/3] Resolve conflicts --- hello-git/.gitee/ISSUE_TEMPLATE.zh-CN.md | 13 ++ .../.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md | 12 ++ hello-git/.gitignore | 138 ++++++++++++ hello-git/Add README_yangnan.md | 1 + hello-git/LICENSE | 201 ++++++++++++++++++ hello-git/README.md | 61 ++++++ hello-git/README_Shaoyuxin.md | 1 + hello-git/README_WangHao.md | 3 + hello-git/README_baijianhe.md | 1 + hello-git/README_chencuiran.md | 1 + hello-git/README_chenshuo.md | 1 + hello-git/README_chenyujie.md | 1 + hello-git/README_dayizhe.md | 1 + hello-git/README_dongzihao.md | 1 + hello-git/README_dutianyu.md | 1 + hello-git/README_fanyali.md | 1 + hello-git/README_fuzeqi.md | 1 + hello-git/README_fuzhanchen.md | 1 + hello-git/README_gaiyumeng.md | 1 + hello-git/README_gaoyufeng.md | 1 + hello-git/README_gaozhi.md | 1 + hello-git/README_gengyifan.md | 1 + hello-git/README_guocaixia.md | 1 + hello-git/README_guopeiyi.md | 1 + hello-git/README_guoyao.md | 1 + hello-git/README_hanziyi.md | 1 + hello-git/README_hezhiyang.md | 1 + hello-git/README_huruipei.md | 1 + hello-git/README_huyingjuan.md | 1 + hello-git/README_huziqi.md | 1 + hello-git/README_jiamengjie.md | 1 + hello-git/README_kongweibin.md | 1 + hello-git/README_lifuming.md | 1 + hello-git/README_lijingxuan.md | 1 + hello-git/README_lipeihang.md | 1 + hello-git/README_lishishi.md | 1 + hello-git/README_litianzheng.md | 1 + hello-git/README_liudianyi.md | 1 + hello-git/README_liuhaoyang.md | 1 + hello-git/README_liujunchen.md | 1 + hello-git/README_liuluyang.md | 1 + hello-git/README_liumengxuan.md | 1 + hello-git/README_liupeitong.md | 2 + hello-git/README_liuwenxuan.md | 1 + hello-git/README_liuyimeng.md | 1 + hello-git/README_lixiaochang.md | 0 hello-git/README_lixin.md | 1 + hello-git/README_liyan.md | 1 + hello-git/README_liyiheng.md | 1 + hello-git/README_lizhaofeng.md | 1 + hello-git/README_lvmenglu.md | 1 + hello-git/README_mazhiyvan.md | 1 + hello-git/README_renmengying.md | 1 + hello-git/README_renquanheng.md | 1 + hello-git/README_songluyun.md | 1 + hello-git/README_sunyajie.md | 1 + hello-git/README_sunyang.md | 1 + hello-git/README_sunyasen.md | 1 + hello-git/README_suzeyang.md | 1 + hello-git/README_wangbingsen.md | 1 + hello-git/README_wangshuo.md | 1 + hello-git/README_wangwanyu.md | 1 + hello-git/README_wangyanbo.md | 2 + hello-git/README_wangyiya.md | 1 + hello-git/README_wangyu.md | 1 + hello-git/README_wangziyi.md | 1 + hello-git/README_weizhongshuo.md | 1 + hello-git/README_yangshiwen.md | 1 + hello-git/README_yanhaobo.md | 1 + hello-git/README_yanriheng.md | 1 + hello-git/README_yanyiwei.md | 1 + hello-git/README_yuzhouchen.md | 1 + hello-git/README_zhangchenglin.md | 3 + hello-git/README_zhangchenqiang.md | 1 + hello-git/README_zhangjingdian.md | 1 + hello-git/README_zhangjun.md | 1 + hello-git/README_zhangkaiyang.md | 1 + hello-git/README_zhangmengxin.md | 1 + hello-git/README_zhangyushuo.md | 1 + hello-git/README_zhaojiahui.md | 1 + hello-git/README_zhaoshijie.md | 2 + hello-git/README_zhaowentao.md | 1 + hello-git/README_zhoumu.md | 1 + hello-git/README_zhujianling.md | 1 + ...E_\344\273\273\345\244\251\346\264\213.md" | 1 + ...E_\350\224\241\346\231\250\351\230\263.md" | 1 + hello-git/RENAME_wanghaoran.md | 1 + hello-git/docs/Group_Repo_Guide.md | 34 +++ hello-git/docs/Previous_Knowledge.md | 73 +++++++ hello-git/docs/Quick_Start.md | 20 ++ hello-git/hello-git/.keep | 0 91 files changed, 640 insertions(+) create mode 100644 hello-git/.gitee/ISSUE_TEMPLATE.zh-CN.md create mode 100644 hello-git/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md create mode 100644 hello-git/.gitignore create mode 100644 hello-git/Add README_yangnan.md create mode 100644 hello-git/LICENSE create mode 100644 hello-git/README.md create mode 100644 hello-git/README_Shaoyuxin.md create mode 100644 hello-git/README_WangHao.md create mode 100644 hello-git/README_baijianhe.md create mode 100644 hello-git/README_chencuiran.md create mode 100644 hello-git/README_chenshuo.md create mode 100644 hello-git/README_chenyujie.md create mode 100644 hello-git/README_dayizhe.md create mode 100644 hello-git/README_dongzihao.md create mode 100644 hello-git/README_dutianyu.md create mode 100644 hello-git/README_fanyali.md create mode 100644 hello-git/README_fuzeqi.md create mode 100644 hello-git/README_fuzhanchen.md create mode 100644 hello-git/README_gaiyumeng.md create mode 100644 hello-git/README_gaoyufeng.md create mode 100644 hello-git/README_gaozhi.md create mode 100644 hello-git/README_gengyifan.md create mode 100644 hello-git/README_guocaixia.md create mode 100644 hello-git/README_guopeiyi.md create mode 100644 hello-git/README_guoyao.md create mode 100644 hello-git/README_hanziyi.md create mode 100644 hello-git/README_hezhiyang.md create mode 100644 hello-git/README_huruipei.md create mode 100644 hello-git/README_huyingjuan.md create mode 100644 hello-git/README_huziqi.md create mode 100644 hello-git/README_jiamengjie.md create mode 100644 hello-git/README_kongweibin.md create mode 100644 hello-git/README_lifuming.md create mode 100644 hello-git/README_lijingxuan.md create mode 100644 hello-git/README_lipeihang.md create mode 100644 hello-git/README_lishishi.md create mode 100644 hello-git/README_litianzheng.md create mode 100644 hello-git/README_liudianyi.md create mode 100644 hello-git/README_liuhaoyang.md create mode 100644 hello-git/README_liujunchen.md create mode 100644 hello-git/README_liuluyang.md create mode 100644 hello-git/README_liumengxuan.md create mode 100644 hello-git/README_liupeitong.md create mode 100644 hello-git/README_liuwenxuan.md create mode 100644 hello-git/README_liuyimeng.md create mode 100644 hello-git/README_lixiaochang.md create mode 100644 hello-git/README_lixin.md create mode 100644 hello-git/README_liyan.md create mode 100644 hello-git/README_liyiheng.md create mode 100644 hello-git/README_lizhaofeng.md create mode 100644 hello-git/README_lvmenglu.md create mode 100644 hello-git/README_mazhiyvan.md create mode 100644 hello-git/README_renmengying.md create mode 100644 hello-git/README_renquanheng.md create mode 100644 hello-git/README_songluyun.md create mode 100644 hello-git/README_sunyajie.md create mode 100644 hello-git/README_sunyang.md create mode 100644 hello-git/README_sunyasen.md create mode 100644 hello-git/README_suzeyang.md create mode 100644 hello-git/README_wangbingsen.md create mode 100644 hello-git/README_wangshuo.md create mode 100644 hello-git/README_wangwanyu.md create mode 100644 hello-git/README_wangyanbo.md create mode 100644 hello-git/README_wangyiya.md create mode 100644 hello-git/README_wangyu.md create mode 100644 hello-git/README_wangziyi.md create mode 100644 hello-git/README_weizhongshuo.md create mode 100644 hello-git/README_yangshiwen.md create mode 100644 hello-git/README_yanhaobo.md create mode 100644 hello-git/README_yanriheng.md create mode 100644 hello-git/README_yanyiwei.md create mode 100644 hello-git/README_yuzhouchen.md create mode 100644 hello-git/README_zhangchenglin.md create mode 100644 hello-git/README_zhangchenqiang.md create mode 100644 hello-git/README_zhangjingdian.md create mode 100644 hello-git/README_zhangjun.md create mode 100644 hello-git/README_zhangkaiyang.md create mode 100644 hello-git/README_zhangmengxin.md create mode 100644 hello-git/README_zhangyushuo.md create mode 100644 hello-git/README_zhaojiahui.md create mode 100644 hello-git/README_zhaoshijie.md create mode 100644 hello-git/README_zhaowentao.md create mode 100644 hello-git/README_zhoumu.md create mode 100644 hello-git/README_zhujianling.md create mode 100644 "hello-git/README_\344\273\273\345\244\251\346\264\213.md" create mode 100644 "hello-git/README_\350\224\241\346\231\250\351\230\263.md" create mode 100644 hello-git/RENAME_wanghaoran.md create mode 100644 hello-git/docs/Group_Repo_Guide.md create mode 100644 hello-git/docs/Previous_Knowledge.md create mode 100644 hello-git/docs/Quick_Start.md create mode 100644 hello-git/hello-git/.keep diff --git a/hello-git/.gitee/ISSUE_TEMPLATE.zh-CN.md b/hello-git/.gitee/ISSUE_TEMPLATE.zh-CN.md new file mode 100644 index 0000000..f09d98d --- /dev/null +++ b/hello-git/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -0,0 +1,13 @@ +### 该问题是怎么引起的? + + + +### 重现步骤 + + + +### 报错信息 + + + + diff --git a/hello-git/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md b/hello-git/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md new file mode 100644 index 0000000..6199c1e --- /dev/null +++ b/hello-git/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md @@ -0,0 +1,12 @@ +### 相关的Issue + + +### 原因(目的、解决的问题等) + + +### 描述(做了什么,变更了什么) + + +### 测试用例(新增、改动、可能影响的功能) + + diff --git a/hello-git/.gitignore b/hello-git/.gitignore new file mode 100644 index 0000000..a81c8ee --- /dev/null +++ b/hello-git/.gitignore @@ -0,0 +1,138 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ diff --git a/hello-git/Add README_yangnan.md b/hello-git/Add README_yangnan.md new file mode 100644 index 0000000..76550f1 --- /dev/null +++ b/hello-git/Add README_yangnan.md @@ -0,0 +1 @@ +hello yangnan. \ No newline at end of file diff --git a/hello-git/LICENSE b/hello-git/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/hello-git/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/hello-git/README.md b/hello-git/README.md new file mode 100644 index 0000000..a12d6dd --- /dev/null +++ b/hello-git/README.md @@ -0,0 +1,61 @@ +# Hello Git 实践项目 + +欢迎来到“Hello Git”实践项目!本项目旨在帮助大家掌握基本的Git操作技巧,包括克隆仓库、创建分支、提交更改以及发起合并请求。请仔细阅读以下指南并按步骤操作。 + +## 目的 +- 学习如何使用Git进行版本控制。 +- 掌握如何在团队中协作开发项目。 + +## 步骤 + +### 1. 克隆仓库 +首先,你需要将项目从Gitee克隆到本地计算机。打开终端或命令行工具,执行以下命令: + +``` +git clone https://gitee.com/bdu-ai-all/hello-git.git +cd hello-git +``` + +### 2. 创建分支 +为了不影响主分支,每个同学都需要在自己的分支上进行开发。创建并切换到你的个人分支: +``` +git checkout -b your_full_name +``` + +### 3. 编写并提交代码 +在项目根目录下创建一个名为 `README_你的全拼姓名.md` 的文件,内容为一行文本:“Hello, 你的全拼姓名”。例如,如果你的名字是张三,那么文件名应为README_zhangsan.md,内容应为Hello, zhangsan. +保存文件后,添加并提交更改: +``` +git add README_你的全拼姓名.md +git commit -m "Add README_你的全拼姓名.md" +``` + +### 4. 推送更改到远程仓库 +将你的更改推送到Gitee上的个人分支: +``` +git push origin your_full_name +``` +### 5. 发起合并请求 +登录到Gitee网站,进入hello-git项目页面 [https://gitee.com/bdu-ai-all/hello-git](https://gitee.com/bdu-ai-all/hello-git)。切换到自己的分支后,你应该会看到一个提示,询问你是否要创建一个新的合并请求。点击该提示,填写合并请求的标题和描述,然后提交。 + +### 6. 解决合并冲突(如有) +如果多个同学同时修改了同一个文件的同一部分,可能会发生合并冲突。当你的合并请求被审查时,如果发现有冲突,Gitee会通知你。此时,你需要拉取最新的主分支代码,解决冲突,然后重新提交: +``` +git checkout master +git pull origin master +git checkout your_full_name +git merge master +``` +- 解决冲突后 +``` +git add . +git commit -m "Resolve conflicts" +git push origin your_full_name +``` + +## 注意事项 + +- 分支命名:请确保你的分支名称是你的真实姓名的全拼,以便于识别。 +- 提交信息:每次提交时,请务必写明清晰的提交信息,以便其他人理解你做了什么更改。 +- 保持沟通:如果有任何问题或不确定的地方,请及时与老师或同学沟通。 +- 遵守规则:请尊重他人的代码,不要随意修改不属于你的部分。 \ No newline at end of file diff --git a/hello-git/README_Shaoyuxin.md b/hello-git/README_Shaoyuxin.md new file mode 100644 index 0000000..8dd9655 --- /dev/null +++ b/hello-git/README_Shaoyuxin.md @@ -0,0 +1 @@ + Hello,Shaoyuxin diff --git a/hello-git/README_WangHao.md b/hello-git/README_WangHao.md new file mode 100644 index 0000000..438b864 --- /dev/null +++ b/hello-git/README_WangHao.md @@ -0,0 +1,3 @@ +Hello,WangHao + + diff --git a/hello-git/README_baijianhe.md b/hello-git/README_baijianhe.md new file mode 100644 index 0000000..77670bf --- /dev/null +++ b/hello-git/README_baijianhe.md @@ -0,0 +1 @@ +hello,baijianhe \ No newline at end of file diff --git a/hello-git/README_chencuiran.md b/hello-git/README_chencuiran.md new file mode 100644 index 0000000..f207cd9 --- /dev/null +++ b/hello-git/README_chencuiran.md @@ -0,0 +1 @@ +Hello, chencuiran \ No newline at end of file diff --git a/hello-git/README_chenshuo.md b/hello-git/README_chenshuo.md new file mode 100644 index 0000000..8be2c41 --- /dev/null +++ b/hello-git/README_chenshuo.md @@ -0,0 +1 @@ +Hello, all! \ No newline at end of file diff --git a/hello-git/README_chenyujie.md b/hello-git/README_chenyujie.md new file mode 100644 index 0000000..7ec9cde --- /dev/null +++ b/hello-git/README_chenyujie.md @@ -0,0 +1 @@ +hello chenyujie \ No newline at end of file diff --git a/hello-git/README_dayizhe.md b/hello-git/README_dayizhe.md new file mode 100644 index 0000000..79ee486 --- /dev/null +++ b/hello-git/README_dayizhe.md @@ -0,0 +1 @@ +Hello dayizhe \ No newline at end of file diff --git a/hello-git/README_dongzihao.md b/hello-git/README_dongzihao.md new file mode 100644 index 0000000..b03935c --- /dev/null +++ b/hello-git/README_dongzihao.md @@ -0,0 +1 @@ +Hello, dongzihao diff --git a/hello-git/README_dutianyu.md b/hello-git/README_dutianyu.md new file mode 100644 index 0000000..18c86c3 --- /dev/null +++ b/hello-git/README_dutianyu.md @@ -0,0 +1 @@ +hello "dutianyu" \ No newline at end of file diff --git a/hello-git/README_fanyali.md b/hello-git/README_fanyali.md new file mode 100644 index 0000000..2378ac8 --- /dev/null +++ b/hello-git/README_fanyali.md @@ -0,0 +1 @@ +Hello,fanyali. \ No newline at end of file diff --git a/hello-git/README_fuzeqi.md b/hello-git/README_fuzeqi.md new file mode 100644 index 0000000..3d5225f --- /dev/null +++ b/hello-git/README_fuzeqi.md @@ -0,0 +1 @@ +Hello, fuzeqi \ No newline at end of file diff --git a/hello-git/README_fuzhanchen.md b/hello-git/README_fuzhanchen.md new file mode 100644 index 0000000..830fa24 --- /dev/null +++ b/hello-git/README_fuzhanchen.md @@ -0,0 +1 @@ +"hello.fuzhanchen" \ No newline at end of file diff --git a/hello-git/README_gaiyumeng.md b/hello-git/README_gaiyumeng.md new file mode 100644 index 0000000..660a414 --- /dev/null +++ b/hello-git/README_gaiyumeng.md @@ -0,0 +1 @@ +hello, gaiyumeng \ No newline at end of file diff --git a/hello-git/README_gaoyufeng.md b/hello-git/README_gaoyufeng.md new file mode 100644 index 0000000..0f82d3a --- /dev/null +++ b/hello-git/README_gaoyufeng.md @@ -0,0 +1 @@ +Hello,gaoyufeng \ No newline at end of file diff --git a/hello-git/README_gaozhi.md b/hello-git/README_gaozhi.md new file mode 100644 index 0000000..8a6e1a0 --- /dev/null +++ b/hello-git/README_gaozhi.md @@ -0,0 +1 @@ +"Hello, gaozhi" diff --git a/hello-git/README_gengyifan.md b/hello-git/README_gengyifan.md new file mode 100644 index 0000000..317819b --- /dev/null +++ b/hello-git/README_gengyifan.md @@ -0,0 +1 @@ +Hello, gengyifan \ No newline at end of file diff --git a/hello-git/README_guocaixia.md b/hello-git/README_guocaixia.md new file mode 100644 index 0000000..439e588 --- /dev/null +++ b/hello-git/README_guocaixia.md @@ -0,0 +1 @@ +Hello, guocaixia. \ No newline at end of file diff --git a/hello-git/README_guopeiyi.md b/hello-git/README_guopeiyi.md new file mode 100644 index 0000000..f55e073 --- /dev/null +++ b/hello-git/README_guopeiyi.md @@ -0,0 +1 @@ +Hello, guopeiyi. \ No newline at end of file diff --git a/hello-git/README_guoyao.md b/hello-git/README_guoyao.md new file mode 100644 index 0000000..561763a --- /dev/null +++ b/hello-git/README_guoyao.md @@ -0,0 +1 @@ +Hello,guoyao \ No newline at end of file diff --git a/hello-git/README_hanziyi.md b/hello-git/README_hanziyi.md new file mode 100644 index 0000000..b6fc4c6 --- /dev/null +++ b/hello-git/README_hanziyi.md @@ -0,0 +1 @@ +hello \ No newline at end of file diff --git a/hello-git/README_hezhiyang.md b/hello-git/README_hezhiyang.md new file mode 100644 index 0000000..b215b7f --- /dev/null +++ b/hello-git/README_hezhiyang.md @@ -0,0 +1 @@ +hello hezhiyang \ No newline at end of file diff --git a/hello-git/README_huruipei.md b/hello-git/README_huruipei.md new file mode 100644 index 0000000..a2753c4 --- /dev/null +++ b/hello-git/README_huruipei.md @@ -0,0 +1 @@ +# Hello,huruipei \ No newline at end of file diff --git a/hello-git/README_huyingjuan.md b/hello-git/README_huyingjuan.md new file mode 100644 index 0000000..6cfbfa1 --- /dev/null +++ b/hello-git/README_huyingjuan.md @@ -0,0 +1 @@ +Hello,huyingjuan \ No newline at end of file diff --git a/hello-git/README_huziqi.md b/hello-git/README_huziqi.md new file mode 100644 index 0000000..271ce0a --- /dev/null +++ b/hello-git/README_huziqi.md @@ -0,0 +1 @@ +Hello, huziqi \ No newline at end of file diff --git a/hello-git/README_jiamengjie.md b/hello-git/README_jiamengjie.md new file mode 100644 index 0000000..c0d9936 --- /dev/null +++ b/hello-git/README_jiamengjie.md @@ -0,0 +1 @@ +Hello, jiamengjie. \ No newline at end of file diff --git a/hello-git/README_kongweibin.md b/hello-git/README_kongweibin.md new file mode 100644 index 0000000..46c2ad4 --- /dev/null +++ b/hello-git/README_kongweibin.md @@ -0,0 +1 @@ +hello,kongweibin \ No newline at end of file diff --git a/hello-git/README_lifuming.md b/hello-git/README_lifuming.md new file mode 100644 index 0000000..3052b87 --- /dev/null +++ b/hello-git/README_lifuming.md @@ -0,0 +1 @@ +hello,lifuming \ No newline at end of file diff --git a/hello-git/README_lijingxuan.md b/hello-git/README_lijingxuan.md new file mode 100644 index 0000000..4419c87 --- /dev/null +++ b/hello-git/README_lijingxuan.md @@ -0,0 +1 @@ +hello,lijingxuan \ No newline at end of file diff --git a/hello-git/README_lipeihang.md b/hello-git/README_lipeihang.md new file mode 100644 index 0000000..3f101b5 --- /dev/null +++ b/hello-git/README_lipeihang.md @@ -0,0 +1 @@ +Hello,lipeihang! \ No newline at end of file diff --git a/hello-git/README_lishishi.md b/hello-git/README_lishishi.md new file mode 100644 index 0000000..0b106c4 --- /dev/null +++ b/hello-git/README_lishishi.md @@ -0,0 +1 @@ +Hello, lishishi diff --git a/hello-git/README_litianzheng.md b/hello-git/README_litianzheng.md new file mode 100644 index 0000000..1d91a47 --- /dev/null +++ b/hello-git/README_litianzheng.md @@ -0,0 +1 @@ +Hello,litianzheng \ No newline at end of file diff --git a/hello-git/README_liudianyi.md b/hello-git/README_liudianyi.md new file mode 100644 index 0000000..ec337de --- /dev/null +++ b/hello-git/README_liudianyi.md @@ -0,0 +1 @@ +Hello, liudianyi \ No newline at end of file diff --git a/hello-git/README_liuhaoyang.md b/hello-git/README_liuhaoyang.md new file mode 100644 index 0000000..1f46f36 --- /dev/null +++ b/hello-git/README_liuhaoyang.md @@ -0,0 +1 @@ +hello liuhaoyang \ No newline at end of file diff --git a/hello-git/README_liujunchen.md b/hello-git/README_liujunchen.md new file mode 100644 index 0000000..0d205c9 --- /dev/null +++ b/hello-git/README_liujunchen.md @@ -0,0 +1 @@ +hello liujunchen \ No newline at end of file diff --git a/hello-git/README_liuluyang.md b/hello-git/README_liuluyang.md new file mode 100644 index 0000000..fedb2e7 --- /dev/null +++ b/hello-git/README_liuluyang.md @@ -0,0 +1 @@ +Hello,liuluyang \ No newline at end of file diff --git a/hello-git/README_liumengxuan.md b/hello-git/README_liumengxuan.md new file mode 100644 index 0000000..12f214e --- /dev/null +++ b/hello-git/README_liumengxuan.md @@ -0,0 +1 @@ +Hello,liuemengxuan \ No newline at end of file diff --git a/hello-git/README_liupeitong.md b/hello-git/README_liupeitong.md new file mode 100644 index 0000000..f4e8994 --- /dev/null +++ b/hello-git/README_liupeitong.md @@ -0,0 +1,2 @@ +Hello,liupeitong + diff --git a/hello-git/README_liuwenxuan.md b/hello-git/README_liuwenxuan.md new file mode 100644 index 0000000..032a0e1 --- /dev/null +++ b/hello-git/README_liuwenxuan.md @@ -0,0 +1 @@ +Hello, liuwenxuan diff --git a/hello-git/README_liuyimeng.md b/hello-git/README_liuyimeng.md new file mode 100644 index 0000000..71e34d0 --- /dev/null +++ b/hello-git/README_liuyimeng.md @@ -0,0 +1 @@ +hello,liuyimeng! \ No newline at end of file diff --git a/hello-git/README_lixiaochang.md b/hello-git/README_lixiaochang.md new file mode 100644 index 0000000..e69de29 diff --git a/hello-git/README_lixin.md b/hello-git/README_lixin.md new file mode 100644 index 0000000..c5dc6aa --- /dev/null +++ b/hello-git/README_lixin.md @@ -0,0 +1 @@ +Hello,lixin \ No newline at end of file diff --git a/hello-git/README_liyan.md b/hello-git/README_liyan.md new file mode 100644 index 0000000..382f4c6 --- /dev/null +++ b/hello-git/README_liyan.md @@ -0,0 +1 @@ +Hello, liyan. \ No newline at end of file diff --git a/hello-git/README_liyiheng.md b/hello-git/README_liyiheng.md new file mode 100644 index 0000000..b5bcfcf --- /dev/null +++ b/hello-git/README_liyiheng.md @@ -0,0 +1 @@ +hello,liyiheng \ No newline at end of file diff --git a/hello-git/README_lizhaofeng.md b/hello-git/README_lizhaofeng.md new file mode 100644 index 0000000..ccac677 --- /dev/null +++ b/hello-git/README_lizhaofeng.md @@ -0,0 +1 @@ +hello,lizhaofeng \ No newline at end of file diff --git a/hello-git/README_lvmenglu.md b/hello-git/README_lvmenglu.md new file mode 100644 index 0000000..ae9094f --- /dev/null +++ b/hello-git/README_lvmenglu.md @@ -0,0 +1 @@ +Hello,lvmenglu. \ No newline at end of file diff --git a/hello-git/README_mazhiyvan.md b/hello-git/README_mazhiyvan.md new file mode 100644 index 0000000..5141bad --- /dev/null +++ b/hello-git/README_mazhiyvan.md @@ -0,0 +1 @@ +Hello,mazhiyvan. \ No newline at end of file diff --git a/hello-git/README_renmengying.md b/hello-git/README_renmengying.md new file mode 100644 index 0000000..ca9ff01 --- /dev/null +++ b/hello-git/README_renmengying.md @@ -0,0 +1 @@ +hello, renmengying \ No newline at end of file diff --git a/hello-git/README_renquanheng.md b/hello-git/README_renquanheng.md new file mode 100644 index 0000000..44b8fdf --- /dev/null +++ b/hello-git/README_renquanheng.md @@ -0,0 +1 @@ +Hello,renquanheng. \ No newline at end of file diff --git a/hello-git/README_songluyun.md b/hello-git/README_songluyun.md new file mode 100644 index 0000000..4a1651e --- /dev/null +++ b/hello-git/README_songluyun.md @@ -0,0 +1 @@ +hello,songluyun \ No newline at end of file diff --git a/hello-git/README_sunyajie.md b/hello-git/README_sunyajie.md new file mode 100644 index 0000000..0293bdd --- /dev/null +++ b/hello-git/README_sunyajie.md @@ -0,0 +1 @@ +"Hello,sunyajie" \ No newline at end of file diff --git a/hello-git/README_sunyang.md b/hello-git/README_sunyang.md new file mode 100644 index 0000000..abaa318 --- /dev/null +++ b/hello-git/README_sunyang.md @@ -0,0 +1 @@ +Hello,sunyang. \ No newline at end of file diff --git a/hello-git/README_sunyasen.md b/hello-git/README_sunyasen.md new file mode 100644 index 0000000..bd42dad --- /dev/null +++ b/hello-git/README_sunyasen.md @@ -0,0 +1 @@ +Hello.sunyasen \ No newline at end of file diff --git a/hello-git/README_suzeyang.md b/hello-git/README_suzeyang.md new file mode 100644 index 0000000..2e1e46e --- /dev/null +++ b/hello-git/README_suzeyang.md @@ -0,0 +1 @@ +Hello ,suzeyang \ No newline at end of file diff --git a/hello-git/README_wangbingsen.md b/hello-git/README_wangbingsen.md new file mode 100644 index 0000000..356310a --- /dev/null +++ b/hello-git/README_wangbingsen.md @@ -0,0 +1 @@ +hello, wangbingsen. \ No newline at end of file diff --git a/hello-git/README_wangshuo.md b/hello-git/README_wangshuo.md new file mode 100644 index 0000000..286e263 --- /dev/null +++ b/hello-git/README_wangshuo.md @@ -0,0 +1 @@ +hello, wangshuo \ No newline at end of file diff --git a/hello-git/README_wangwanyu.md b/hello-git/README_wangwanyu.md new file mode 100644 index 0000000..ab61b2d --- /dev/null +++ b/hello-git/README_wangwanyu.md @@ -0,0 +1 @@ +"Hello, zhangsan" diff --git a/hello-git/README_wangyanbo.md b/hello-git/README_wangyanbo.md new file mode 100644 index 0000000..6dcc849 --- /dev/null +++ b/hello-git/README_wangyanbo.md @@ -0,0 +1,2 @@ +Hello, wangyanbo + diff --git a/hello-git/README_wangyiya.md b/hello-git/README_wangyiya.md new file mode 100644 index 0000000..fa409de --- /dev/null +++ b/hello-git/README_wangyiya.md @@ -0,0 +1 @@ +hello, wangyiya \ No newline at end of file diff --git a/hello-git/README_wangyu.md b/hello-git/README_wangyu.md new file mode 100644 index 0000000..03025cf --- /dev/null +++ b/hello-git/README_wangyu.md @@ -0,0 +1 @@ +Hello, wangyu \ No newline at end of file diff --git a/hello-git/README_wangziyi.md b/hello-git/README_wangziyi.md new file mode 100644 index 0000000..9a6c9c4 --- /dev/null +++ b/hello-git/README_wangziyi.md @@ -0,0 +1 @@ +Hello, wangziyi. \ No newline at end of file diff --git a/hello-git/README_weizhongshuo.md b/hello-git/README_weizhongshuo.md new file mode 100644 index 0000000..bed857e --- /dev/null +++ b/hello-git/README_weizhongshuo.md @@ -0,0 +1 @@ +"Hello, weizhongshuo" diff --git a/hello-git/README_yangshiwen.md b/hello-git/README_yangshiwen.md new file mode 100644 index 0000000..5d3abbf --- /dev/null +++ b/hello-git/README_yangshiwen.md @@ -0,0 +1 @@ +Hello, yangshiwen. \ No newline at end of file diff --git a/hello-git/README_yanhaobo.md b/hello-git/README_yanhaobo.md new file mode 100644 index 0000000..9f15545 --- /dev/null +++ b/hello-git/README_yanhaobo.md @@ -0,0 +1 @@ +hello,yanhaobo. \ No newline at end of file diff --git a/hello-git/README_yanriheng.md b/hello-git/README_yanriheng.md new file mode 100644 index 0000000..ff9ac1a --- /dev/null +++ b/hello-git/README_yanriheng.md @@ -0,0 +1 @@ +Hello,yanriheng \ No newline at end of file diff --git a/hello-git/README_yanyiwei.md b/hello-git/README_yanyiwei.md new file mode 100644 index 0000000..46544c3 --- /dev/null +++ b/hello-git/README_yanyiwei.md @@ -0,0 +1 @@ +Hello,yanyiwei \ No newline at end of file diff --git a/hello-git/README_yuzhouchen.md b/hello-git/README_yuzhouchen.md new file mode 100644 index 0000000..c89f5c2 --- /dev/null +++ b/hello-git/README_yuzhouchen.md @@ -0,0 +1 @@ +hello, yuzhouchen \ No newline at end of file diff --git a/hello-git/README_zhangchenglin.md b/hello-git/README_zhangchenglin.md new file mode 100644 index 0000000..38137d1 --- /dev/null +++ b/hello-git/README_zhangchenglin.md @@ -0,0 +1,3 @@ + + +hi zhangchenglin diff --git a/hello-git/README_zhangchenqiang.md b/hello-git/README_zhangchenqiang.md new file mode 100644 index 0000000..7350593 --- /dev/null +++ b/hello-git/README_zhangchenqiang.md @@ -0,0 +1 @@ +hello,zhangchenqiang \ No newline at end of file diff --git a/hello-git/README_zhangjingdian.md b/hello-git/README_zhangjingdian.md new file mode 100644 index 0000000..cdb0068 --- /dev/null +++ b/hello-git/README_zhangjingdian.md @@ -0,0 +1 @@ +Hello,zhangjingdian. \ No newline at end of file diff --git a/hello-git/README_zhangjun.md b/hello-git/README_zhangjun.md new file mode 100644 index 0000000..dd5308e --- /dev/null +++ b/hello-git/README_zhangjun.md @@ -0,0 +1 @@ +hello zhangjun \ No newline at end of file diff --git a/hello-git/README_zhangkaiyang.md b/hello-git/README_zhangkaiyang.md new file mode 100644 index 0000000..b65b033 --- /dev/null +++ b/hello-git/README_zhangkaiyang.md @@ -0,0 +1 @@ +hello: \ No newline at end of file diff --git a/hello-git/README_zhangmengxin.md b/hello-git/README_zhangmengxin.md new file mode 100644 index 0000000..cdecb29 --- /dev/null +++ b/hello-git/README_zhangmengxin.md @@ -0,0 +1 @@ +hello zhangmengxin \ No newline at end of file diff --git a/hello-git/README_zhangyushuo.md b/hello-git/README_zhangyushuo.md new file mode 100644 index 0000000..1a6b2e7 --- /dev/null +++ b/hello-git/README_zhangyushuo.md @@ -0,0 +1 @@ +# Hello,zhangyushuo \ No newline at end of file diff --git a/hello-git/README_zhaojiahui.md b/hello-git/README_zhaojiahui.md new file mode 100644 index 0000000..43dcad2 --- /dev/null +++ b/hello-git/README_zhaojiahui.md @@ -0,0 +1 @@ +hello,zhaojiahui \ No newline at end of file diff --git a/hello-git/README_zhaoshijie.md b/hello-git/README_zhaoshijie.md new file mode 100644 index 0000000..befc08e --- /dev/null +++ b/hello-git/README_zhaoshijie.md @@ -0,0 +1,2 @@ +# hello,zhaoshijie + diff --git a/hello-git/README_zhaowentao.md b/hello-git/README_zhaowentao.md new file mode 100644 index 0000000..63eb155 --- /dev/null +++ b/hello-git/README_zhaowentao.md @@ -0,0 +1 @@ +Hello, zhaowentao \ No newline at end of file diff --git a/hello-git/README_zhoumu.md b/hello-git/README_zhoumu.md new file mode 100644 index 0000000..a173e8e --- /dev/null +++ b/hello-git/README_zhoumu.md @@ -0,0 +1 @@ +"hellozhoumu" \ No newline at end of file diff --git a/hello-git/README_zhujianling.md b/hello-git/README_zhujianling.md new file mode 100644 index 0000000..593db6f --- /dev/null +++ b/hello-git/README_zhujianling.md @@ -0,0 +1 @@ +hello,zhujianling diff --git "a/hello-git/README_\344\273\273\345\244\251\346\264\213.md" "b/hello-git/README_\344\273\273\345\244\251\346\264\213.md" new file mode 100644 index 0000000..8803ae9 --- /dev/null +++ "b/hello-git/README_\344\273\273\345\244\251\346\264\213.md" @@ -0,0 +1 @@ +"Hello, 任天洋" diff --git "a/hello-git/README_\350\224\241\346\231\250\351\230\263.md" "b/hello-git/README_\350\224\241\346\231\250\351\230\263.md" new file mode 100644 index 0000000..6b6d5d3 --- /dev/null +++ "b/hello-git/README_\350\224\241\346\231\250\351\230\263.md" @@ -0,0 +1 @@ +"Hello, ̳" diff --git a/hello-git/RENAME_wanghaoran.md b/hello-git/RENAME_wanghaoran.md new file mode 100644 index 0000000..060bd4d --- /dev/null +++ b/hello-git/RENAME_wanghaoran.md @@ -0,0 +1 @@ +Hello,wanghaoran diff --git a/hello-git/docs/Group_Repo_Guide.md b/hello-git/docs/Group_Repo_Guide.md new file mode 100644 index 0000000..c9c39a7 --- /dev/null +++ b/hello-git/docs/Group_Repo_Guide.md @@ -0,0 +1,34 @@ +# 小组项目指南 +来到我们的终极小组项目了,下面是你需要了解的要点。 + +## 在Gitee网站上创建代码仓库(由仓库负责人完成) +由小组推举或组长指派,确定代码仓库负责人(也可由组长本人担任),负责以下工作。 + +#### (1)新建仓库 +右上角➕-“新建仓库”,设置仓库名称、介绍、语言-python、gitignore模板-python、开源许可证-Apache-2.0、模板文件-全勾选、分支模型-单分支模型(只创建master分支) +- 仓库名称:ai2022-班级号-组号,如ai2022-2-g3 + +#### (2)仓库成员管理 +邀请团队成员加入项目仓库,成员拥有开发者权限。 + +#### (3)其它设置 +- 分支管理 +- 代码审查设置:至少需要一名审查人员审核通过后可合并,无需测试人员审核 +- 指定审核人员:可由一人担任审核工作,也可全员担任。 + +## 协同开发(由每一位组员协同完成) +参考 [README.md](../README.md) +1. 克隆项目仓库 +2. 创建功能分支 +3. 开发和提交代码 +4. 推送代码到远程仓库 +5. 创建Pull Request(PR) +6. 代码审查 +7. 合并PR + +## 编写文档 +- 项目文档应包括项目简介、功能描述、代码结构、运行说明等。 +- 文档文件通常使用Markdown格式编写。 + +## 撰写项目报告 +需严格按照模板规范撰写。 \ No newline at end of file diff --git a/hello-git/docs/Previous_Knowledge.md b/hello-git/docs/Previous_Knowledge.md new file mode 100644 index 0000000..2b207ad --- /dev/null +++ b/hello-git/docs/Previous_Knowledge.md @@ -0,0 +1,73 @@ +# Git 和 Gitee 前置知识讲解 + +如果你从未使用过Git、Gitee,下面的内容可以作为前置知识,帮助你理解代码协同的核心概念和流程。 + +## 1. 什么是Git? +- **定义**:Git 是一个分布式版本控制系统,用于追踪对文件的修改历史,允许多个开发者协作开发项目。 +- **特点**: + - **分布式**:每个开发者都有完整的**代码仓库**副本,可以在本地进行版本控制。 + - **分支管理**:Git 提供强大的分支管理功能,方便多人协作开发。 + - **轻量级**:Git 的操作速度快,占用资源少。 + +## 2. 什么是Gitee? +- **定义**:Gitee(码云)是中国最大的代码托管平台,类似于GitHub,提供代码托管、项目管理、协作开发等功能。 +- **特点**: + - **代码托管**:支持Git仓库的托管,可以创建公共或私有仓库。 + - **项目管理**:提供项目管理工具,如Issue、Wiki、项目看板等。 + - **协作开发**:支持多人协作开发,提供 **Pull Request(PR**功能。 + - **集成服务**:提供CI/CD、代码质量检测、代码统计等服务。 + +## 3. Git的基本概念 +- **仓库(Repository)**: + - **定义**:一个包含所有项目文件和历史记录的目录。 + - **类型**:本地仓库和远程仓库。 +- **本地仓库(Local Repository)**: + - **定义**:在开发者本地计算机上的Git仓库。 + - **操作**:初始化仓库、克隆仓库、提交更改等。 +- **远程仓库(Remote Repository)**: + - **定义**:托管在服务器上的Git仓库,如Gitee上的仓库。 + - **操作**:推送更改、拉取更改、创建和管理远程分支等。 + +## 4. 分支(Branch) +- **定义**:分支是开发过程中的一种隔离机制,允许开发者在独立的环境中进行开发,而不影响主分支。 +- **主分支(Main/Master Branch)**: + - **定义**:默认的主分支,通常用于存放稳定版本的代码。 +- **其它分支**: + - **定义**:用于开发新功能的分支,完成后可以通过Pull Request合并到主分支。 + +## 5. 提交(Commit) +- **定义**:将代码的更改保存到仓库的历史记录中。 +- **操作**: + - **添加文件到暂存区**:`git add ` 或 `git add .` + - **提交更改**:`git commit -m "commit message"` + +## 6. 拉取(Pull)和推送(Push) +- **拉取(Pull)**: + - **定义**:从远程仓库获取最新的更改并合并到本地仓库。 + - **操作**:`git pull origin ` +- **推送(Push)**: + - **定义**:将本地仓库的更改推送到远程仓库。 + - **操作**:`git push origin ` + +## 7. Pull Request(PR) +- **定义**:一种请求将一个分支的更改合并到另一个分支的机制,通常用于代码审查和协作。 +- **流程**: + - **创建PR**:在Gitee上创建一个Pull Request,选择源分支和目标分支。 + - **审查代码**:其他开发者可以审查代码并提出意见。 + - **合并PR**:审查通过后,将源分支的更改合并到目标分支。 + +## 8. 合并冲突(Merge Conflict) +- **定义**:当两个分支对同一文件的同一部分进行了不同的修改,合并时会产生冲突。 +- **解决方法**: + - **手动解决**:打开冲突文件,手动选择保留哪一部分的修改。 + - **提交解决后的文件**:`git add ` 和 `git commit -m "Resolve conflicts"` + +## 9. 其他常用命令 +- **查看状态**:`git status` +- **查看提交历史**:`git log` + +## 10. 最佳实践 +- **定期提交**:频繁提交小的更改,便于追踪和回滚。 +- **清晰的提交信息**:每次提交时,写明清晰的提交信息,便于他人理解。 +- **保持分支整洁**:定期合并和删除不再需要的分支。 +- **代码审查**:利用Pull Request进行代码审查,提高代码质量。 \ No newline at end of file diff --git a/hello-git/docs/Quick_Start.md b/hello-git/docs/Quick_Start.md new file mode 100644 index 0000000..ddb244f --- /dev/null +++ b/hello-git/docs/Quick_Start.md @@ -0,0 +1,20 @@ +# 学习使用Git和Gitee进行代码协同开发 + +## 一、初始设置 +### 1、注册Gitee网站 +[https://gitee.com/](https://gitee.com/) +- 注册账号,设置姓名为全拼 +- 绑定邮箱 +- 登录成功之后,右上角“设置”-“个人设置”-“个人资料”- + - “基本信息”页面,修改姓名为全拼 + - “个人空间地址”页面,可以设置个人空间地址 + +### 2、安装Git +[https://git-scm.com/downloads/win](https://git-scm.com/downloads/win) +在命令行中敲入"git"显示"usage: git"等信息即为安装成功。 + +### 3、配置Git +``` +git config --global user.email your_email_address +git config --global user.name your_name +``` diff --git a/hello-git/hello-git/.keep b/hello-git/hello-git/.keep new file mode 100644 index 0000000..e69de29 -- Gitee