Clone your git repository
git clone
Add openshift git repository as remote
git remote add openshift -f
Merging
git merge openshift/master -s recursive -X ours
Pushing your code to openshift repository
git push openshift HEAD