#!/bin/bash


if [ $# -eq 0 ];
then
        echo "usage withBranch [branchname]"
        exit 0
fi

if [ $1 -eq "master" ];
then
        echo "no way !!"
        exit 0
fi


BRANCHNAME=$1



pushd /c/zGit
bash gitAll clean -dfx
bash gitAll checkout .
bash gitAll checkout master
bash gitAll remote prune origin
bash gitAll pull



echo "search for $BRANCHNAME"

for REPODIR in $(bash gitAll branch --all --list origin/$BRANCHNAME | grep $BRANCHNAME | cut -d " " -f1)
do
    echo "on $REPODIR"
    pushd "$REPODIR" > /dev/null

    REPO="$(pwd | xargs cygpath --windows | sed 's/\\/\\\\/g')"

    git clean -dfx
    git fetch
    git checkout $BRANCHNAME
    git pull
    git pull origin master
    git status
    echo ":n next file"
    sleep 1

    #git diff --name-only | uniq | xargs vim ; reset
    git diff --name-only | uniq | xargs vim 
    #echo -e "\033c"
    #reset
    git status

    echo "check merge conflict and push"

    git add -A
    git commit -m "$(cum) merge conflict"
    git push

    popd > /dev/null
done



#echo -e "\033c"
#reset




popd

cd  /c/zGit/LumedProject
echo "now do your fuckin job"