Git Getting Started notes (20)-use eclipse based git development process grooming

First, create local branch 1, download/update master branch download: Git clone update: Git pull

2. Open local branch based on master

Ii. based on local branch development final commit Create remote branch 1, before modification

2, modified 3, commit local branch (do not push)

Third, merge Trunk code 1, update the local backbone

Switch to local trunk to perform pull

Changes in the Pull trunk

2. Merge local trunk differences to local branch

Cut back to the branch, merge the local trunk to the local branch.

3. Resolve conflicts and submit local branches

After submission, the Red arrow disappears.

4. Push local branch to remote (create remote branch)

Third, the backbone and branch of the remote Merge 1, submit the remote branch merge to the trunk application

Open Gitserver

2. Merge the distal branch to the distal trunk

If you are an administrator

Iv. local post-processing 1, update local trunk 2, delete local branch

Git Getting Started notes (20)-use eclipse based git development process grooming