better handling of discarding files

2021-03-20 12:46:27 +11:00
parent 058bcddc53
commit ad1468f66f
67 changed files with 163 additions and 4 deletions
@@ -0,0 +1 @@
+three
@@ -0,0 +1 @@
+ref: refs/heads/conflict_second
@@ -0,0 +1 @@
+38b645bf2388b21695d22d7f673d87971a78e4ad
@@ -0,0 +1,10 @@
+Merge branch 'conflict' into conflict_second
+
+# Conflicts:
+#	added-them-changed-us.txt
+#	both-added.txt
+#	both-deleted.txt
+#	both-modded.txt
+#	changed-them-added-us.txt
+#	deleted-them.txt
+#	deleted-us.txt
@@ -0,0 +1 @@
+c64dd6aea3efd197ed630dedc1ffb538d35c3fdb
@@ -0,0 +1,10 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = true
+[user]
+	email = CI@example.com
+	name = CI
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
@@ -0,0 +1,7 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+.DS_Store
@@ -0,0 +1,7 @@
+0000000000000000000000000000000000000000 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100	commit (initial): one
+0e5c9fd43732ca064946e9c582fd6f159774db84 eb4814e3f9d5eb1869704cf4498420c9f4a141da CI <CI@example.com> 1616203051 +1100	commit: both-deleted.txt renamed in added-them-changed-us.txt
+eb4814e3f9d5eb1869704cf4498420c9f4a141da 38b645bf2388b21695d22d7f673d87971a78e4ad CI <CI@example.com> 1616203051 +1100	commit: two
+38b645bf2388b21695d22d7f673d87971a78e4ad 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100	checkout: moving from conflict to conflict_second
+0e5c9fd43732ca064946e9c582fd6f159774db84 698e214196fed018bb4164380745dd2df3bbac74 CI <CI@example.com> 1616203051 +1100	commit: both-deleted.txt renamed in changed-them-added-us.txt
+698e214196fed018bb4164380745dd2df3bbac74 c64dd6aea3efd197ed630dedc1ffb538d35c3fdb CI <CI@example.com> 1616203052 +1100	commit: three
+c64dd6aea3efd197ed630dedc1ffb538d35c3fdb c64dd6aea3efd197ed630dedc1ffb538d35c3fdb CI <CI@example.com> 1616203052 +1100	reset: moving to conflict_second
@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100	commit (initial): one
+0e5c9fd43732ca064946e9c582fd6f159774db84 eb4814e3f9d5eb1869704cf4498420c9f4a141da CI <CI@example.com> 1616203051 +1100	commit: both-deleted.txt renamed in added-them-changed-us.txt
+eb4814e3f9d5eb1869704cf4498420c9f4a141da 38b645bf2388b21695d22d7f673d87971a78e4ad CI <CI@example.com> 1616203051 +1100	commit: two
@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100	branch: Created from conflict
+0e5c9fd43732ca064946e9c582fd6f159774db84 698e214196fed018bb4164380745dd2df3bbac74 CI <CI@example.com> 1616203051 +1100	commit: both-deleted.txt renamed in changed-them-added-us.txt
+698e214196fed018bb4164380745dd2df3bbac74 c64dd6aea3efd197ed630dedc1ffb538d35c3fdb CI <CI@example.com> 1616203052 +1100	commit: three
@@ -0,0 +1,2 @@
+x�ÍA
+Â@@Q×sŠì’¤cR¡ˆÐU�‘§”)x|{„n?~ª¥¼PäKÛÜ¡GÔtO¨KÐÌ”Ê”£kvæEt¶·WÝ`šaœæ§ÿ¬¬¿¦Z@BÂØã� #BG=&ÍOòP¿þIÔ*Ê
@@ -0,0 +1,2 @@
+x�ÎA
+Â0@Q×9Eö‚ÌLÒd"BW=F&™ `l)<¾=‚ÛÏ_¼²öþ�Æ®j§TZ”È¹¥œ…=£“" …E)¶Za³å]ßÃ†ÄJè1…¦�E<ï¢Ÿj¥ÚœH.Ñ›ü�u·ób¯ór×oîÛK/eí7‹�ƒ‰ìÀõ@
@@ -0,0 +1 @@
+x�ŽAjÃ0E»Ö)f_F²$[PJ!«c$}Õ�Èîrü:7Èò=Þâ•÷«’óü¡;@à9K.1[N�mÞA²„6%DÄ4N˜Ì]v¬JŒPR«~œFW„£O>"•0»Vc³!M“¯yöFºl;�/ôu¾üà)ý~Ã©lý›l´ÑñÈÁÒ§µÌæ°Ç”âÍÜäM—¡âE=éSéX“ŽJ×•¤VÔAô¡,²þðø{EæVJK–
@@ -0,0 +1 @@
+38b645bf2388b21695d22d7f673d87971a78e4ad
@@ -0,0 +1 @@
+c64dd6aea3efd197ed630dedc1ffb538d35c3fdb
				`@@ -0,0 +1 @@`
				`Unnamed repository; edit this file 'description' to name the repository.`
				`@@ -0,0 +1 @@`
				`x�ŽAjÃ0E»Ö)f_F²$[PJ!«c$}Õ�Èîrü:7Èò=Þâ•÷«’óü¡;@à9K.1[N�mÞA²„6%DÄ4N˜Ì]v¬JŒPR«~œFW„£O>"•0»Vc³!M“¯yöFºl;�/ôu¾üà)ý~Ã©lý›l´ÑñÈÁÒ§µÌæ°Ç”âÍÜäM—¡âE=éSéX“ŽJ×•¤VÔAô¡,²þðø{EæVJK–`