Certificate acquisition required for tortoiseGit ssh pull

Git version management

Git branch specification:

master -- the production version, always consistent with the production version

publish -- an emergency release version. After the development of the functions that need to be released urgently, they will be merged into this version for testing.

release -- the planned release version into which the tested features are merged

feature/xxx -- feature development version, where xxx is the name of the feature. Develop from the master branch and submit for testing after development is complete

hotfix/xxx -- emergency problem repair version, when a problem is found in production, a version is branched from the master version for repair, and merged back to the master version and the release version after the repair is completed

Requirements development standard steps

Branch feature/xxx version from master version for development.

After development is complete , push feature/xxx to the Git repository

In the project on Gitlab, create a Merge Request,

Source select your development branch, Target branch confirm with the team leader which branch to use (it needs to be arranged according to the launch time and urgency of the project, and sometimes needs to be coordinated with the test, so it can be determined before submission)

Do not accept after submitting the Merge Request, notify the team leader to review the code, and the team leader will accept

test process

After the development on the feature branch is completed, merge the master branch into the feature, and then submit it to the specified test environment for testing

For the requirement of a clear release date, after the test is completed, merge the feature branch into the release branch and wait for the release

For urgent needs (such as release after testing is completed), merge the feature branch into the publish branch for release before release

Publishing process

When publishing the publish branch, merge master into publish to publish. After the online verification is passed, merge the publish into the master and mark it with a tag

When the release branch is released, merge master into release for release. After the online verification is passed, merge the release into the master and mark it with a tag

Special case

When solving production problems, if the modification is small and does not need to be tested, you can modify it directly on the master -- check in -- push -- and then update to the production environment

For online emergency repairs, it is currently acceptable to repair them in production. But it needs to be updated to the master branch in time after the repair (it is not recommended to do this, try to check in to git before publishing) If you forget to check in Git frequently, this method will be prohibited in the future

focus

Make sure the current branch is correct before each code modification

New requirements are developed on the feature branch

master is always the same version as production

tool

An automatic processing script is provided in the project root directory, which can easily merge code, tag and submit

./feature creates a feature branch based on the latest master branch for requirement development

./getmaster merge master branch into current branch

./publish merges the current branch into the publish branch

./release merges the current branch into the release branch

How the script is executed

1. Open Git Bash Here

2. Enter the script name to run and follow the prompts

Naming conventions

feature/xxx The xxx here represents the name of the feature, using the project name or requirement number, and connecting words with underscores , such as feature/xloan2, feature/RA-B-0187

If you can't think of a suitable name, you can use name-year-month-day, such as: hejiangyuan-20160826, and explain in the description what to do to establish this branch

hotfix/xxx where xxx is named with date-serial number, such as hotfix/20160826-1

Tag naming convention: Requirement number-year-month-day-hour minute, such as: RA-B-0187-20160826-0908

If there is no demand number, write the name- year- month-day-hour and minute, such as: hejiangyuan-20160826-0908

tool

Git for windows basic service, must be installed

https://git-for-windows.github.io/

Tortoisegit git (tortoise Git), git client tool, very easy to use.

https://tortoisegit.org/

Eclipse plugin

EGit -- Install via Eclipse Marketplace

configure

After installing Tortoisegit git, go to the Git command line

Execute the following command to set the name and email address ( note to replace it with your name and email address, if it is wrong, you can modify it and execute it again )