General process for enterprise teams to use git for collaborative development

Process outline 1. Code Writing

1. Create a Development Branch (Dev) from the master branch ).
2. Switch to Dev.
3. write code on Dev and submit the local version library.
Note: The Code cannot be modified directly on the marster branch.

Ii. Merge code

1. Switch to the master.
2. Pull the latest code from the remote master to the local master.
3. Switch to Dev.
4. rebase master to Dev.
5. If there is any code conflict, it will be resolved.

Iii. Code submission

1. Switch to the master.
2. Merge Dev code (merge) to the master.
3. Push the local master to the remote master.
4. Keep or delete the dev branch depending on your mood.

Using eclipsegit as an Example

• Create Dev Branch
• Pull the latest code on the marster Branch
• Rebase marster branch code on dev Branch
• Merge Dev branch code on the marster Branch
• Submit the marster branch to the remote database

Xiaoxinhua

General process for enterprise teams to use git for collaborative development