pre-rebase on feature 1
Merge branch 'new_feature1'
pre-rebase
dev on master branch
create the branch in init file
issue with orig file
continuous on branch master
Init of the Training repository
create branch
Merge branch 'new_feature'
Commit in master branch
delete unusefull file
Merge branch 'new_feature1'
dev on feature 1
resolve conflict 2