Eclipse git development Operation Flow

1.eclipse git development operation Flow 1.1 Process Introduction

1)master Master Branch, when the development version is fully validated, the branch can be combined into master,master The status of the release to be a product.

2 develop branch, a major branch of the usual development, feature bug feature or fixed a bug After the development of stable version.

3) Feature branch develop feature develop branching.

4 release branch, This branch of the series from the develop release branch to repair, after the completion of the test pass, respectively, are merged into the master after branching develop branch, followed by master branch to do the normal release.

5)hotfix Branch, which is what we often call the emergency line repair, when a bug on the line and particularly urgent, you can from the master Pull the branch out here for repair, and then merge the master and develop branches separately.

1.2 Management personnel operation

1) Branch Building instructions: In the process introduction in addition to the feature function branch should be for management at the required point in time to establish.

2) log in to gitlab http://10.10.30.180:8180/, select LDAP mode to login

3) Select New Group

4) After entering the group name, create

5) Create a git repository select new Project

6) Create warehouses where you can create multiple warehouses under this group

7) Set up developers in this group

Note: When choosing a person, do not choose to create the person himself, or the right to forget to choose, the situation is difficult to deal with permission coverage.

8) Create an address link after selecting the HTTP method

9) clone address in Eclipse

Select where to save the code

Check that the git repository has been imported locally and put the Project project code in the local code location, select Import Project, or import maven Project

submit the project to a local

Click Commit

submitted to the remote

Create a development branch

Push the Create branch to the remote

1.3 Developer Operations

1) Select the git plugin in eclipse

2) Click Clone Project

3) Enter The warehouse address and User name password in HTTP mode

Click Next

Select Development Branch develop1.1.0 then click Next

Select the path where the code is saved finish

4) Importing maven projects

5) Establish a development branch

Enter the branch name feauture+ version + your own name and click finish.

6) Modify the code in the current branch, the current branch name has changed to FEATURE1.1.0_FANXT

Modify the code to commit to the branch, select Commit, and then select Push Branch

Note: compile files such as. class do not commit

when the branch is modified again and submitted Push Toupstream will not be grayed out to click this commit.

Click Nextto complete

7) before each development, you should switch to the develop1.1.0 Main development Branch before creating the branch and select pullto ensure that the main development branch is up to date.

8) Merge The code of the develop1.1.0 main development Branch into the feature1.1.0_fanxt that needs to be developed now on the branch.

switch to the feature1.1.0_fanxt Branch and click on merge

Select the develop1.1.0 Main Development Branch and click Merge, then click Push to Upstream submit to the remote corresponding development branch

Select the branch FEATURE1.1.0_FANXT you want to develop, and click Merge.

9) After the development of the develop1.1.0 Master Development Branch Merge Code

in the current development Branch FEATURE1.1.0_FANXT Click Merge

Select develop1.1.0 Main Development Branch and click merge.

Note:pull,push,merge encounters code conflict specific handling, see git Plug-in conflict processing, in addition to the best in the merge with the local warehouse as the benchmark, always ensure that the local code base is up-to-date, to prevent conflict.

Eclipse git development Operation Flow