Git tricking Part 2
Merge branch 'origin/dev'