3.
master. main_2.txt update.
4.
b_alfa and ./alfa/alfa.txt
5.
main_2.txt changed.
6.
b_alfa.
alfa.txt changed.
7.
Create b_beta branch../beta/beta.txt
8.
modif main_2.txt
9.
b_beta, update beta.txt
10.
b_beta. Update beta.txt
11.
b_beta. conflicting change at main_2.txt
12.
master. conflicting change main_2.txt
12.
after merge b_beta to master. 
But something happens bad. and git gui help solve conflict.

Merge branch 'b_beta'

Conflicts:
	test2_e_loc_proj/main_2.txt
14.
master. conflicting change at main_2.txt
15.
b_alfa. conlicting change at main_2.txt
16.
after merge b_alfa to master.

Merge branch 'b_alfa'

Conflicts:
	test2_e_loc_proj/main_2.txt
17.
master.
change main_2.txt alfa.txt beta.txt
18.
b_gamma ./gamma/gamma.txt
19.
b_gamma
change gamma.txt
20.
master
del ./alfa/alfa.txt
create ./alfa/alfa_2.txt
del ./beta/
Merge branch 'master' into b_gamma
22.
b_gamma.
update gamma.txt