# base_training

**Repository Path**: moxiaoqibuiith/base_training

## Basic Information

- **Project Name**: base_training
- **Description**: No description available
- **Primary Language**: JavaScript
- **License**: MIT
- **Default Branch**: master
- **Homepage**: None
- **GVP Project**: No

## Statistics

- **Stars**: 1
- **Forks**: 0
- **Created**: 2021-09-20
- **Last Updated**: 2021-11-17

## Categories & Tags

**Categories**: Uncategorized

**Tags**: None

## README

# base_training

#### 介绍


#### 安装教程

1.  yarn

#### 使用说明

1. 查看demo/index.ts 的实现要求
2. 在src/demo/answer 下建立答案文件 qingyi.ts
3. 导出的函数格式 // export default (params) => answer
4. 在src/demo/config/index.ts 添加 'qingyi', 与answer新建文件夹保持同名
5. yarn test demo
6. 只想验证自己的答案 src/demo/config/index.ts 注释掉其他内容


#### 如何解决两个分支之间的冲突

```shell
# 新建两个分支， 更改同一文件
git checkout master   # 切换回master
git checkout -b user1 # 新建并切换到user2
git checkout master   # 切换回master
git checkout -b user2 # 新建并切换到user1
git branch            # 查看分支
##    * user2         # 当前分支
##    user1
##    master

# 修改 /src/demo/config/index.ts
git status
# modified:   src/demo/config/index.ts  (红色)
git add src/demo/config/index.ts
git status
# modified:   src/demo/config/index.ts  (绿色)

git commit -m "user2 update src/demo/config/index.ts"
git log -1

## user2 update src/demo/config/index.ts

git checkout master
git merge user2

## 如果出现下面这一行提示， 就代表两个分支之间存在冲突
## Automatic merge failed; fix conflicts and then commit the result.

git checkout user1
# 修改 /src/demo/config/index.ts
git status
# modified:   src/demo/config/index.ts  (红色)
git add src/demo/config/index.ts
git status
# modified:   src/demo/config/index.ts  (绿色)

git commit -m "user1 update src/demo/config/index.ts"
git log -1

## user1 update src/demo/config/index.ts

git checkout master
git merge user1

# Automatic merge failed; fix conflicts and then commit the result.

git status
:'
    You have unmerged paths.
      (fix conflicts and run "git commit")
      (use "git merge --abort" to abort the merge)
    
    Unmerged paths:
      (use "git add <file>..." to mark resolution)
            both modified:   src/demo/config/index.ts
'

#  src/demo/config/index.ts

:'
    <<<<<<< HEAD
        'user2',
    =======
        'user1',
    >>>>>>> user1
'

# 解决冲突 删除多余代码
# 决定冲突代码保留哪些
:'
    'user2',
    'user1',
'

git add src/demo/config/index.ts
git commit -m "merge src/demo/config/index.ts"
git log -3

# master
# merge src/demo/config/index.ts
# user1 update src/demo/config/index.ts
# user2 update src/demo/config/index.ts


## 重置
git reset --hard origin/master 
```