phortonssf
5/15/2019 - 12:02 AM

update all git branches, choose rebase or merge. -Xtheirs to favor master or -XOurs favors branch history

update all git branches, choose rebase or merge. -Xtheirs to favor master or -XOurs favors branch history

update_branches.sh
content_copyfile_download
#!/bin/bash


for BRANCH in `git branch  --list|sed 's/\*//g'`;
  do 
    git checkout $BRANCH
    git rebase -Xtheirs master
       
      done
    git checkout master;