# vtm-new-2021

**Repository Path**: code2497/vtm-new-2021

## Basic Information

- **Project Name**: vtm-new-2021
- **Description**: vtm2021招新网站
- **Primary Language**: Unknown
- **License**: Not specified
- **Default Branch**: master
- **Homepage**: None
- **GVP Project**: No

## Statistics

- **Stars**: 0
- **Forks**: 0
- **Created**: 2021-03-07
- **Last Updated**: 2021-09-03

## Categories & Tags

**Categories**: Uncategorized

**Tags**: None

## README

# vtm-new-2021

## Project setup
```
npm install
```

### Compiles and hot-reloads for development
```
npm run serve
```

### Compiles and minifies for production
```
npm run build
```

### Customize configuration
See [Configuration Reference](https://cli.vuejs.org/config/)。。

# git

发生冲突到群里对线



```bash
git init 
git remote add origin https://gitee.com/code2497/vtm-new-2021.git
git pull origin master
```

创建分支develop

```bash
git checkout -b develop master
git pull origin develop
```

创建自己的分支

```bash
git checkout -b xxx develop
```



提交代码到自己分支

```bash
# 确认在自己分支
git add .
git commit -m ""
git push origin xxx
```



将自己的分支合并到develop分支

```bash
git checkout develop
git pull origin develop #确保develop分支最新
git merge xxx --no-ff -m ""
git push origin develop
```



写代码前

先合并一下develop分支到自己分支

```bash
git checkout develop #切换到develop分支
git pull origin develop #拉取远程的develop分支

git checkout xxx # 切换到自己的分支
git merge develop # 将develop分支合并到自己的分支
```