solarized-emacs

a fork of Bozhidar Batsov's solarized-emacs
git clone https://git.trogloxene.org/solarized-emacs.git
Log | Files | Refs | README

create-merge-conflict-repo.sh (612B)

      1 #!/bin/bash
      2 
      3 set -e
      4 set -x
      5 
      6 mkdir test-repo
      7 cd test-repo
      8 git init .
      9 touch HELLO
     10 git add HELLO
     11 git commit -m"hello"
     12 
     13 
     14 get_files(){
     15   local version=${1}
     16   shift
     17   for f in pdb.py tempfile.py os.py inspect.py mimetypes.py; do
     18     curl -o "${f}" "https://raw.githubusercontent.com/python/cpython/${version}/Lib/${f}"
     19   done
     20   git add -A
     21   git commit -m"version ${v}"
     22 }
     23 
     24 git checkout master
     25 git checkout -b v1
     26 get_files v3.4.8
     27 git checkout -b v2
     28 git checkout -b v3
     29 git checkout v1
     30 get_files v3.5.0
     31 get_files v3.6.0
     32 git checkout v2
     33 get_files v3.7.0
     34 git checkout v3
     35 get_files v3.8.0
     36 git checkout master
     37 git checkout v2