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