Scenario: Linux code on-Library conflict handling

The processing method is as follows:

1) Perform abandon operation on the Gerrit;

2) Make the conflicting positions, back up the modified folders (only back up the changes in the conflicting git silos);

3) execution

git reset--hard head^;

4) Rm-rf modified file header (all changes to the conflict compartment are deleted);

5) to the conflicting Git bin, execute

Git checkout.

Overwrite changes;

6) execution

Repo Sync

If a prompt appears,

XXX Branch published but not merged

The CD to the warehouse, execute the

Git pull

Keep local low and consistent with the library;

7) Re-modify the merge and then execute

Git commit

Repo upload

Scenario: Linux code on-Library conflict handling