merge

.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

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
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+=======

README.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <a href="https://apps.apple.com/app/id1452689527" target="_blank">
 <img src="https://user-images.githubusercontent.com/26833433/82944393-f7644d80-9f4f-11ea-8b87-1a5b04f555f1.jpg" width="1000"></a>
 &nbsp
@@ -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