chrisjrob chrisjrob

## build-bash-lenny.sh
# inspired by http://askubuntu.com/a/528171 and the comments below

# build bash 3.2, though this should work for other versions as well
BASH_MAJOR=3
BASH_MINOR=2

# prerequisites
sudo apt-get install build-essential gettext bison

# get bash source

## README.md

      
              2 files
            
          
              0 forks
            
          
              0 comments
            
          
              1 star
            
          
                domcleal
                / README.md
            
            
              Last active
              May 8, 2017 13:32
            
              
                Resolve simple git merge/rebase conflicts
              
          
    Setup


git clone https://gist.github.com/abef31ca104ecffa2d99fb904aadcf59.git git-merging
cd git-merging

Merging

Merge the change-value branch into master, to bring in the change of value:

git merge origin/change-value will fail with "Automatic merge failed; fix
	# inspired by http://askubuntu.com/a/528171 and the comments below

	# build bash 3.2, though this should work for other versions as well
	BASH_MAJOR=3
	BASH_MINOR=2

	# prerequisites
	sudo apt-get install build-essential gettext bison

	# get bash source