Skip to content

Commit

Permalink
Merge pull request #6 from chendaniely/conflict_branch_2
Browse files Browse the repository at this point in the history
Conflict branch 2
  • Loading branch information
chendaniely authored May 2, 2023
2 parents c1a7871 + 6091507 commit 015e050
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,5 @@ git commit -m "b2 c2"
git push origin conflict_branch_2
git push origin conflict_branch_1
```
Changes to b2 commit 1
Changes to b2 commit 2

0 comments on commit 015e050

Please sign in to comment.