Will provide interactive overwrite of diff between two branches

sync_config_branch.sh

#!/usr/bin/env bash

CONFIGBRANCH=add_config_files
CURRENTBRANCH=`git symbolic-ref --short -q HEAD`
TMPPATH=tmp/config

rm -r $TMPPATH

NAMES="`git diff --name-only $CURRENTBRANCH $CONFIGBRANCH`"

for name in $NAMES
do
  if [ "$name" != ".gitignore" ]
  then
    #git checkout add_config_files -- $name
    mkdir -p $TMPPATH/`dirname $name`
    git show $CONFIGBRANCH:$name > $TMPPATH/$name
  fi
done

for name in $NAMES
do
  if [ -f $name ]
  then
    DIFF=`diff $TMPPATH/$name $name`
    if [[ $DIFF ]]
    then
      tput setaf 1; tput bold;
      echo "File $name Already Exists in Project"
      tput setaf 4;
      diff $TMPPATH/$name $name
      tput sgr 0;
      cp -i $TMPPATH/$name $name
    fi
  else
    tput setaf 1; tput bold;
    echo "File $name Copied"
    tput sgr 0;
  fi
done
tput sgr 0;