|
|
|
@@ -0,0 +1,67 @@ |
|
|
|
# DEV_GUIDE |
|
|
|
|
|
|
|
## 代码管理 |
|
|
|
|
|
|
|
--- |
|
|
|
|
|
|
|
| 操作类型 | 工具 | 难度 | |
|
|
|
| -------- | ---------- | ---- | |
|
|
|
| 提交代码 | SourceTree | 低 | |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## 环境配置 |
|
|
|
|
|
|
|
### 解决冲突 <a id='jjct'></a> |
|
|
|
|
|
|
|
1. 步骤一 |
|
|
|
|
|
|
|
2. 步骤二 |
|
|
|
|
|
|
|
- **变基** |
|
|
|
|
|
|
|
- *贮藏* |
|
|
|
|
|
|
|
- ***补丁*** |
|
|
|
|
|
|
|
- ~~获取~~ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3. 步骤三 |
|
|
|
|
|
|
|
### Git基础 |
|
|
|
|
|
|
|
> Git是分布式版本控制系统 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
### SourceTree操作 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
`git status` |
|
|
|
|
|
|
|
```shell |
|
|
|
git init progect |
|
|
|
``` |
|
|
|
|
|
|
|
[Git官网](https://git-scm.com) |
|
|
|
|
|
|
|
<img src="D:\信捷-各岗位入职前学习\TrainCamp_liuxiaohuan_BasicLearn\Markdown\pictures\a.jpeg" alt="a.jpeg" style="zoom:33%;" /> |
|
|
|
|
|
|
|
[返回顶部](#DEV_GUIDE) |
|
|
|
|
|
|
|
[查看冲突解决](#jjct) |
|
|
|
|
|
|
|
[TOC] |
|
|
|
|
|
|
|
[联系我们](contact) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<span id="contact"></span> |
