xuzikang
/
test
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'master11' 

# Conflicts:
#	GIT的概念.txt
master
17870919867 2 weeks ago
parent
b7b89c91cf aaa8d96583
commit
34f787bed3
1 changed files with 7 additions and 6 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +7
    -6
      GIT的概念.txt

+ 7
- 6
GIT的概念.txt View File

@@ -6,15 +6,16 @@ Git 是什么：分布式版本控制系统，用于追踪文件变化

冲突test

<<<<<<< HEAD

主干变基修改
=======
这是变基测试分支的内容
>>>>>>> d8ba707 (变基的测试)
第一种补丁应用测试第二次尝试

<<<<<<< HEAD
第三种补丁应用测试第二次尝试



修改版本
修改版本
=======

加点东西
>>>>>>> master11

Write Preview
Loading…
Cancel
Save