T1
T2
T3
T4
T5
T5
T6
T7
T8
T9
T10
1
Object A
Object B
Main
Branch
Branch A
Object A
Object B
2
4
Create
Branch
Initial
State
Update
Object A
Update
Object A
1
3
Update
Object B
Merge Operation
With Conflict
3
Identify
Conflicts
4
3
4
A4
DROP
2
2
3
B3
KEEP
3
3
T1
T2
T3
T4
T5
T5
T6
T7
T8
T9
T10
1
Object A
Object B
Main
Branch
Branch A
Object A
Object B
2
4
Create
Branch
Initial
State
Update
Object A
Update
Object A
1
3
Update
Object B
Rebase Operation
With Conflict
3
Identify
Conflicts
4
3
4
A4
DROP
2
2
3
B3
KEEP
3
3