up

Author: wilsonmar

LICENSE

@@ -0,0 +1,17 @@
+#!/bin/bash
+# From https://gist.github.com/JonathanMH/397fc427842614dd4803
+# Described in https://jonathanmh.com/how-to-create-a-git-merge-conflict/
+mkdir git-repo
+cd git-repo
+git init
+touch my_code.sh
+git add my_code.sh
+echo "echo Hello" > my_code.sh
+git commit -am 'initial'
+git checkout -b new_branch
+echo "echo \"Hello World\"" > my_code.sh
+git commit -am 'first commit on new_branch'
+git checkout master
+echo "echo \"Hello World!\"" > my_code.sh
+git commit -am 'second commit on master'
+git merge new_branch

README.md

@@ -0,0 +1,64 @@
+#!/bin/bash
+# ./git-flow-create.sh
+# Written by Wilson Mar ([email protected])
+# This creates the conditions for testing Michael Haggerty's "git imerge",
+# as described in https://wilsonmar.github.io/git-flow
+# cd 
+
+# Before running this, copy this file to the folder where you want the test repo created,
+# then chmod 555 git-imerge-test-create.sh
+# Running this creates a folder above the script folder
+# and creates a file named somefile.txt in both the master branch and "branch1" branch.
+# This file is in https://github.com/wilsonmar/git-utilities/git-imerge-test-create.sh
+# Also see https://jonathanmh.com/how-to-create-a-git-merge-conflict/
+# https://github.com/cirosantilli/test-git-conflict
+# uses ruby printf statements to generate file content.
+
+echo "## Navigating to working folder:"
+cd ~/gits/hotwilson
+pwd
+echo "## Deleting .git and files from previous run:"
+rm -rf git-utilities
+exit
+#echo "## This hangs if no internet is available:"
+#git clone https://github.com/wilsonmar/git-utilities
+#cd git-utilities
+#git branch -avv
+# git checkout master
+git checkout -b feat1
+echo "more stuff">>README.md
+git status
+git add README.md -A
+git commit -m"Update for show"
+git log --graph --oneline
+git reflog
+exit
+
+git push
+git tag v1.3.4
+git push --tags
+
+git remote add upstream https://github.com/wilsonmar/git-utilities
+# git pull --rebase
+git config --global pull.rebase true
+git fetch upstream
+git checkout master
+# git difftool
+git merge upstream/master
+cat README.md
+
+git request-pull v1.0 https://github.com/upstream/sisters  master
+
+echo "## Working upstream:"
+git fetch --dry-run
+exit
+git log ^master origin/master
+git fetch upstream
+git checkout master
+#git pull --rebase --autostash
+git merge upstream/master
+cat README.md
+#git push -u origin master
+git config --global alias.up '!git fetch && git rebase --autostash FETCH_HEAD'
+git up
+

create-conflict.sh

@@ -68,14 +68,16 @@ git log --pretty=format:"%h %s %ad" --graph --since=1.days --date=relative;
 git checkout master
 cat somefile.md
 git branch -avv
-#ls -al
+
+read -p "Press enter to continue"
+
 # You should now have:
 #    0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 '  ← master
 #     \                                               
 #      A -- B -- C --- D --- E --- F --- G --- H --- I  ← branch
-git checkout feature1
-git-imerge start --name=NAME --goal=full master
-git imerge diagram --name=NAME
+git checkout master
+git-imerge start --name=NAME --goal=full feature1
+#git imerge diagram --name=NAME
 # sed -i "" "s/B2 feature1/B2 master/g" somefile.md
 #awk '{gsub(/pattern/,"replacement")}' file
 # TODO: Remove <<<<<<< HEAD, =======, line, and >>>>>>> 865fba2c721d68aca6486499f5e9cb33f95f5311
@@ -93,5 +95,5 @@ git imerge diagram --name=NAME
 # git commit -m"Fix I9"
 # git imerge continue
 
-# git imerge finish
+# git imerge finish --goal=merge
 # git imerge diagram --name=NAME