https://github.com/splatlab/squeakr
09 January 2021, 06:17:54 UTC
Revision 755ceefe33a9ef87482762f4381882c6ec974709 authored by Prashant Pandey on 30 November 2017, 16:57:50 UTC, committed by Prashant Pandey on 30 November 2017, 16:57:50 UTC 
Adding Squeakr exact.
1 parent 485b9d5
Raw File
Tip revision: 755ceefe33a9ef87482762f4381882c6ec974709 authored by Prashant Pandey on 30 November 2017, 16:57:50 UTC
Adding Squeakr exact.
Tip revision: 755ceef
merge_into_master.sh
#!/bin/bash

if [ $# -eq 0 ]
then
    echo "No input arguments provided.  Usage is merge_into_master.sh <branch_to_merge_in>"
    exit 1
fi

feature=$1

# from https://stackoverflow.com/questions/173919/is-there-a-theirs-version-of-git-merge-s-ours
# in case branchA is not our current branch
git checkout master

# make merge commit but without conflicts!!
# the contents of 'ours' will be discarded later
git merge -s ours ${feature}

# make temporary branch to merged commit
git branch branchTEMP

# get contents of working tree and index to the one of branchB
git reset --hard ${feature}

# reset to our merged commit but 
# keep contents of working tree and index
git reset --soft branchTEMP

# change the contents of the merged commit
# with the contents of branchB
git commit --amend

# get rid off our temporary branch
git branch -D branchTEMP

# verify that the merge commit contains only contents of branchB
git diff HEAD ${feature}
back to top