First commit in conflict branch a
Temporary solution for some task (will be conflicted with other branch)
Finished with test brunch a
Removed .idea path
Removed .idea path
Merge branch 'git_conflict_branch_b'
First commit in conflict branch a
Finished with test brunch a
Merge branch 'git_conflict_branch_a' of github.com:FireFry/MyProject into git_conflict_branch_a
Merge branch 'git_conflict_branch_a'