diff --git a/.gitignore b/.gitignore index 07993ab..9ffe858 100755 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +<<<<<<< HEAD # Repo-specific GitIgnore ---------------------------------------------------------------------------------------------- *.jpg *.jpeg @@ -242,4 +243,4 @@ atlassian-ide-plugin.xml com_crashlytics_export_strings.xml crashlytics.properties crashlytics-build.properties -fabric.properties +fabric.properties \ No newline at end of file diff --git a/LICENSE b/LICENSE index 9e419e0..0b231e1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,4 @@ +<<<<<<< HEAD GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 @@ -671,4 +672,5 @@ into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -. \ No newline at end of file +. +======= \ No newline at end of file diff --git a/README.md b/README.md index 9e62506..3d7424a 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +<<<<<<< HEAD   @@ -128,3 +129,24 @@ For business inquiries and professional support requests please visit us at http ## Contact **Issues should be raised directly in the repository.** For business inquiries or professional support requests please visit https://www.ultralytics.com or email Glenn Jocher at glenn.jocher@ultralytics.com. +======= +#### 从命令行创建一个新的仓库 + +```bash +touch README.md +git init +git add README.md +git commit -m "first commit" +git remote add origin https://bdgit.educoder.net/m53297601/yolov5.git +git push -u origin master + +``` + +#### 从命令行推送已经创建的仓库 + +```bash +git remote add origin https://bdgit.educoder.net/m53297601/yolov5.git +git push -u origin master + +``` +>>>>>>> 9a0ef12741cf5198da7fa4e017b4f1097783f5b2