Table of contents

Git uses

Create a new blank folder to pull the actual git project

Create a new project in your own git group

Open the idea project

git merge branch

method one:

Method 2: merge branches directly in idea

virtual machine

Git uses

Create a new blank folder to pull the actual git project

Need to delete the .git file

git clone http://47.96.143.141:9999/xmsz/xc-parent.git

Create a new project in your own git group

1) Create a new blank folder "xuecheng".

2) Clone your own new empty project

git clone http://47.96.143.141:9999/web_158_group_11/xc-parent.git

3) Cut the content of the actual combat project into the "xuecheng" folder;

4) Add and push to the git project of your own group

git add .

git commit -m '初始化项目工程'

git push

5) Create a new branch

 git checkout -b develop

6) developPush the local branch to origina remote repository named , and developset the remote branch as the upstream branch of the local branch.

git push --set-upstream origin develop

7) Team members pull the "develop" branch

git clone -b develop "git地址"

Open the idea project

1) Create a new branch based on the branch you are in

2) For example, if you create a user function module branch (format feature_function_date), you can boldly develop it, and the content has nothing to do with the main branch

3) After the function is written, commit the checkmark (green) in the upper right corner

Add a description (written according to the git submission manual format)

Submit to the remote warehouse, and the local branch also has

4) Do not click Rollback easily when multiple people are developing at the same time

git merge branch

method one:

1) Create a new merge request

2) Merge from left to right

3) The sub-branch will be deleted if the merge is successful ( the development branch is an important branch and cannot be killed!!! Kill him, and the company will kill you ) Do not check!

4) There are conflicts in the code, which must be resolved before they can be merged

5) Delete these special symbols and adjust the code format (chat with two developers!!)

6) Submit after processing

7) Continue to merge branches

Method 2: merge branches directly in idea

1) Merge test01 and test01 directly into develop

2) "Pull into Current Using Merge" is to merge the content of test01 into the dev branch

3) Merge test02 again

4) Jump out to display a file conflict, generally choose to merge and adjust by yourself

5) Click on the title of the book to adjust the codes on the left and right sides

virtual machine

Import virtual machine files

1) To take a snapshot

2) Decompress the one-click startup script into the virtual machine

Start all related containers with one click

#在对应的文件夹目录下输入命令
docker-compose up -d

3) If you bought a virtual machine, you need to modify the corresponding file configuration:

Import the front-end environment

1) git pulls the front-end code

#前端门户和机构管理端
git clone http://git.eehp.cn/xmsz/project-xczx2-portal-vue-ts.git

#前端平台管理端：
git clone http://git.eehp.cn/xmsz/project-xczx2-admin-vue-ts.git

2) Check whether the computer has node software

Open cmd (no problem based on 12.21.0/14.21.3 version)