git checkout gpon
#dsl -> gpon
#find last merge commit
commit=`git log dsl | grep "BOREA-64-SYNC:gpon->dsl" --before-context=5 --max-count=1 | grep "commit " --max-count=1 | awk '{print $2}'`
git merge $commit~1
git merge -s ours --no-commit $commit
echo "BOREA-64-SYNC:dsl->gpon" >.git/MERGE_MSG 
git commit
git merge dsl


git checkout dsl
#gpon -> dsl
#find last merge commit
commit=`git log gpon | grep "BOREA-64-SYNC:dsl->gpon" --before-context=5 --max-count=1 | grep "commit " --max-count=1 | awk '{print $2}'`
git merge $commit~1
git merge -s ours --no-commit $commit
echo "BOREA-64-SYNC:gpon->dsl" >.git/MERGE_MSG 
git commit
git merge gpon
