git merge feature/Australia
97 conflicts
git commit -am 'Whatever, I'm tired.'
git push -f
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
git merge feature/Australia
97 conflicts
git commit -am 'Whatever, I'm tired.'
git push -f