migrate merge conflict tests

This commit is contained in:
Jesse Duffield 2023-02-25 22:09:14 +11:00
parent 33f9f81c8c
commit ff3c5d331e
247 changed files with 156 additions and 912 deletions

View file

@ -1,5 +0,0 @@
disableStartupPopups: true
gui:
showFileTree: false
refresher:
refreshInterval: 1

View file

@ -1,36 +0,0 @@
Merge branch 'develop' into other_branch
# Conflicts:
# directory/file
# directory/file2
# file1
# file3
# file4
# file5
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/mergeConflicts/actual/.git/MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch other_branch
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
# new file: cherrypicking1
# new file: cherrypicking2
# new file: cherrypicking3
# new file: cherrypicking4
# new file: cherrypicking5
# new file: cherrypicking6
# new file: cherrypicking7
# new file: cherrypicking8
# new file: cherrypicking9
# modified: file1
# modified: file4
# modified: file5
#

View file

@ -1 +0,0 @@
ref: refs/heads/other_branch

View file

@ -1 +0,0 @@
562af0640203fb5a6e92c090d8d1ded26806d2c4

View file

@ -1,10 +0,0 @@
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
precomposeunicode = true
[user]
email = CI@example.com
name = CI

View file

@ -1 +0,0 @@
Unnamed repository; edit this file 'description' to name the repository.

View file

@ -1,7 +0,0 @@
# 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

View file

@ -1,34 +0,0 @@
0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI <CI@example.com> 1617671441 +1000 commit (initial): first commit
1618ce1085acb41fd710e279ac38911aadfb0a09 1618ce1085acb41fd710e279ac38911aadfb0a09 CI <CI@example.com> 1617671441 +1000 checkout: moving from master to feature/cherry-picking
1618ce1085acb41fd710e279ac38911aadfb0a09 b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a CI <CI@example.com> 1617671441 +1000 commit: first commit freshman year
b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e CI <CI@example.com> 1617671441 +1000 commit: second commit subway eat fresh
f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e edd4e2e50eb82125428b045c540a9194d934e180 CI <CI@example.com> 1617671441 +1000 commit: third commit fresh
edd4e2e50eb82125428b045c540a9194d934e180 cc19bee93215b6c20ab129fb2c006762d4ae1497 CI <CI@example.com> 1617671441 +1000 commit: fourth commit cool
cc19bee93215b6c20ab129fb2c006762d4ae1497 b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 CI <CI@example.com> 1617671441 +1000 commit: fifth commit nice
b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 df2c0daa40dcba0dded361a25ff7806b13db59a6 CI <CI@example.com> 1617671441 +1000 commit: sixth commit haha
df2c0daa40dcba0dded361a25ff7806b13db59a6 1fbc3eb4b11cb89b204a593572c2e01462ca5a89 CI <CI@example.com> 1617671441 +1000 commit: seventh commit yeah
1fbc3eb4b11cb89b204a593572c2e01462ca5a89 d3e2708327280097b5e1f8ab69309934b24f8b64 CI <CI@example.com> 1617671441 +1000 commit: eighth commit woo
d3e2708327280097b5e1f8ab69309934b24f8b64 d3e2708327280097b5e1f8ab69309934b24f8b64 CI <CI@example.com> 1617671441 +1000 checkout: moving from feature/cherry-picking to develop
d3e2708327280097b5e1f8ab69309934b24f8b64 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI <CI@example.com> 1617671441 +1000 commit: first commit on develop
a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 1618ce1085acb41fd710e279ac38911aadfb0a09 CI <CI@example.com> 1617671441 +1000 checkout: moving from develop to master
1618ce1085acb41fd710e279ac38911aadfb0a09 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI <CI@example.com> 1617671441 +1000 commit: first commit on master
f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI <CI@example.com> 1617671441 +1000 checkout: moving from master to develop
a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI <CI@example.com> 1617671441 +1000 commit: second commit on develop
55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI <CI@example.com> 1617671441 +1000 checkout: moving from develop to master
f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a19ec0b99e516795f349033f09383f87be0b74e9 CI <CI@example.com> 1617671441 +1000 commit: second commit on master
a19ec0b99e516795f349033f09383f87be0b74e9 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI <CI@example.com> 1617671441 +1000 checkout: moving from master to develop
55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 dd259e90c3748e269bdf1ee3ce537a006d2394aa CI <CI@example.com> 1617671441 +1000 commit: third commit on develop
dd259e90c3748e269bdf1ee3ce537a006d2394aa a19ec0b99e516795f349033f09383f87be0b74e9 CI <CI@example.com> 1617671441 +1000 checkout: moving from develop to master
a19ec0b99e516795f349033f09383f87be0b74e9 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI <CI@example.com> 1617671441 +1000 commit: third commit on master
61db24350a92fa37b2fe35f13eb3dd3f7655f6cf dd259e90c3748e269bdf1ee3ce537a006d2394aa CI <CI@example.com> 1617671441 +1000 checkout: moving from master to develop
dd259e90c3748e269bdf1ee3ce537a006d2394aa e563585cb87cc39b553ca421902d631ea8890118 CI <CI@example.com> 1617671441 +1000 commit: fourth commit on develop
e563585cb87cc39b553ca421902d631ea8890118 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI <CI@example.com> 1617671441 +1000 checkout: moving from develop to master
61db24350a92fa37b2fe35f13eb3dd3f7655f6cf 559043765dc6c32c943b6278b4abbff1e6f52839 CI <CI@example.com> 1617671441 +1000 commit: fourth commit on master
559043765dc6c32c943b6278b4abbff1e6f52839 559043765dc6c32c943b6278b4abbff1e6f52839 CI <CI@example.com> 1617671441 +1000 checkout: moving from master to base_branch
559043765dc6c32c943b6278b4abbff1e6f52839 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000 commit: file
0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000 checkout: moving from base_branch to other_branch
0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000 checkout: moving from other_branch to base_branch
0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 341cf8213827614a274c750cd7dec4307eb41de7 CI <CI@example.com> 1617671441 +1000 commit: file changed
341cf8213827614a274c750cd7dec4307eb41de7 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000 checkout: moving from base_branch to other_branch
0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 562af0640203fb5a6e92c090d8d1ded26806d2c4 CI <CI@example.com> 1617671444 +1000 commit: asd
562af0640203fb5a6e92c090d8d1ded26806d2c4 f8dd12b796f400be7f59d9471670c3080f9c90a1 CI <CI@example.com> 1617671461 +1000 commit (merge): Merge branch 'develop' into other_branch

View file

@ -1,3 +0,0 @@
0000000000000000000000000000000000000000 559043765dc6c32c943b6278b4abbff1e6f52839 CI <CI@example.com> 1617671441 +1000 branch: Created from HEAD
559043765dc6c32c943b6278b4abbff1e6f52839 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000 commit: file
0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 341cf8213827614a274c750cd7dec4307eb41de7 CI <CI@example.com> 1617671441 +1000 commit: file changed

View file

@ -1,5 +0,0 @@
0000000000000000000000000000000000000000 d3e2708327280097b5e1f8ab69309934b24f8b64 CI <CI@example.com> 1617671441 +1000 branch: Created from HEAD
d3e2708327280097b5e1f8ab69309934b24f8b64 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI <CI@example.com> 1617671441 +1000 commit: first commit on develop
a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI <CI@example.com> 1617671441 +1000 commit: second commit on develop
55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 dd259e90c3748e269bdf1ee3ce537a006d2394aa CI <CI@example.com> 1617671441 +1000 commit: third commit on develop
dd259e90c3748e269bdf1ee3ce537a006d2394aa e563585cb87cc39b553ca421902d631ea8890118 CI <CI@example.com> 1617671441 +1000 commit: fourth commit on develop

View file

@ -1,9 +0,0 @@
0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI <CI@example.com> 1617671441 +1000 branch: Created from HEAD
1618ce1085acb41fd710e279ac38911aadfb0a09 b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a CI <CI@example.com> 1617671441 +1000 commit: first commit freshman year
b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e CI <CI@example.com> 1617671441 +1000 commit: second commit subway eat fresh
f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e edd4e2e50eb82125428b045c540a9194d934e180 CI <CI@example.com> 1617671441 +1000 commit: third commit fresh
edd4e2e50eb82125428b045c540a9194d934e180 cc19bee93215b6c20ab129fb2c006762d4ae1497 CI <CI@example.com> 1617671441 +1000 commit: fourth commit cool
cc19bee93215b6c20ab129fb2c006762d4ae1497 b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 CI <CI@example.com> 1617671441 +1000 commit: fifth commit nice
b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 df2c0daa40dcba0dded361a25ff7806b13db59a6 CI <CI@example.com> 1617671441 +1000 commit: sixth commit haha
df2c0daa40dcba0dded361a25ff7806b13db59a6 1fbc3eb4b11cb89b204a593572c2e01462ca5a89 CI <CI@example.com> 1617671441 +1000 commit: seventh commit yeah
1fbc3eb4b11cb89b204a593572c2e01462ca5a89 d3e2708327280097b5e1f8ab69309934b24f8b64 CI <CI@example.com> 1617671441 +1000 commit: eighth commit woo

View file

@ -1,5 +0,0 @@
0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI <CI@example.com> 1617671441 +1000 commit (initial): first commit
1618ce1085acb41fd710e279ac38911aadfb0a09 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI <CI@example.com> 1617671441 +1000 commit: first commit on master
f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a19ec0b99e516795f349033f09383f87be0b74e9 CI <CI@example.com> 1617671441 +1000 commit: second commit on master
a19ec0b99e516795f349033f09383f87be0b74e9 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI <CI@example.com> 1617671441 +1000 commit: third commit on master
61db24350a92fa37b2fe35f13eb3dd3f7655f6cf 559043765dc6c32c943b6278b4abbff1e6f52839 CI <CI@example.com> 1617671441 +1000 commit: fourth commit on master

View file

@ -1,3 +0,0 @@
0000000000000000000000000000000000000000 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000 branch: Created from HEAD
0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 562af0640203fb5a6e92c090d8d1ded26806d2c4 CI <CI@example.com> 1617671444 +1000 commit: asd
562af0640203fb5a6e92c090d8d1ded26806d2c4 f8dd12b796f400be7f59d9471670c3080f9c90a1 CI <CI@example.com> 1617671461 +1000 commit (merge): Merge branch 'develop' into other_branch

View file

@ -1,4 +0,0 @@
x<01><>M
Β0F]η³d&Ν<>΅«c™PΑΪR£θν x·<>ορ½ΌΜσµΕ°«*,ΡΪΙgφ>΅Σ<CE85>
MGΞ<EFBFBD>”X¤ο;³ς¦χ
RlFav(91<39>¨t<C2A8>ΨϊRβCΆNο9~ΦiΩ`α4<CEB1>}σΌήτ<CEAE>—ω (¶?ηφ„<CF86>¦ΡUυΟΉyθ«µLπσΰ£<™/n<>@<

View file

@ -1,2 +0,0 @@
xå<>A
Â0E]çÿAîTz<>I34…˜´âíM‰Kîý0 |>oñ\‡ãa¿ë83ÆBQÉ/h E Çœ }­²Ìa¨ŸAsjAw¿ÞŒ¤ž1O*Bǯ³Š|V¡'5çßC/ƒ¹´ÀóÂQ&c­ý«Û¬5Éêx³ÜÏüâ7Ã0|Æ

View file

@ -1 +0,0 @@
xå<>Ñ €0CývŠLÐÅ\ãj<C3A3>VО´WÄí=Àü<08>„äãùM<†iìf.ŒµPUÊM¤HTá™3T¶`Q¢9ƒ"×^òÂh‡d[éºóÓØËi+B<>Ø;ç~¥/ Y:/¸<PÃ

View file

@ -1,3 +0,0 @@
x<01><>M
Β0F]η³$Σόµ "tΥcL*Sb
ί‚pϋψίKµ”G‡υ©7f06™eς£¤Ιa <0C>4ΆΠHQ8η<38>²Ϊ¨ρ«ƒΗk<>¦i2!ΒΖ <1A>&g#Α;'>‰Ά½―µΑΌΐu^ξό΅²=ωΑq|@kΞ¨µV=Ά:<3A>9WRχΦWψiP_Pθ}Ψκ m·A¬

View file

@ -1,6 +0,0 @@
x<01>ŽA
Â0E]ç³d&S
"BW=F&3E¡mJ<6D>âñ x·<>ÿ>/—eyTðD‡ºÁ¤LÙR4”`½2w¾G1îTzÕ>dÕĈÑmi·µB"CÌ"1æ0Eór‰“ç©áä…£ £¸ôª÷²Ã0ÂeoöIË6Û)—å
(¶ƒ®#8"ºF[Tµ?çîi¹¬
? Ê
joËæ¾Ç^B

View file

@ -1,2 +0,0 @@
xŤÎM
Â0†a×9Ĺě™i&?"BW=FŇNhÁŘR#x| ^ŔíÇűŔ7®µ. :”SŰUˇŁS ­Ř轋‘(0zÉĘÇ8ZĺTĚv}6H$:bQG><3E>+­-xp[bČŠ9°ŠIď6Ż;ô\űᮟT·‡^Ƶހ<<1F>™ŕL<C595>hŽő8ŐôĎÜ´yŮ'ř)XźPÓëŔć ‡Ľ> 

View file

@ -1,2 +0,0 @@
x<01><>M
Β0…]η³d¦iσ"BW=Ζ$™ `<60><>FπψΌ€Λχρ>ήµ”gƒ<67>πΤv@ƒΈh,Ω<>† 9k f${BΦqrSRο²6ΘΞ£·C΄$6ΙyΫMI™ΕfO:η8¥ ΏΫ£ξ0/p<>—»|Έl/ΉΔZn@†lG3!Άκ΄<CEBA>jςg]λ<>ΰ§A]΅πΡmυPA#

View file

@ -1,4 +0,0 @@
x<01><>K
Β0@]η³d&™|
"BW=F“L°Π6¥FρψΌ€ΫΗ{πR]©<E28093>&<µ]4»β9xΑ ΞL)Jb΄F<±ΝΦΗΥ6ξ²6ΘF΄Η`΄Χ±σΡ
•0FΧμ:ΓQs Ρ±_νQwθΈφΓ]>γ²ΝrIuΉ9ςΞ3ΑQτ<>jς§®Κ΄?ό*¨+dyΛ\7υΑΨ>ΰ

View file

@ -1,3 +0,0 @@
x<01>ŽË
Â0E]ç+f/H&<26>}€ˆÐU?c2½¡cKAÿÞŠ?àörÎáêÒ\Èqu( UŒÜAá½ó°c]<5D>PAœj¨C„DÖ¬ñ(Ä5·
¶íY4xŽcîéD«¶cc°b;#Ï2-™ú<E284A2>.ýpÃKÒzÇI—tý6šºal­5ûºŸ*ø7qÎ[¡ŸE1c<è ÉæÊ;C|

View file

@ -1,3 +0,0 @@
xŤŽM
Â0F]çł$“źI"BW=F2NmÁ<6D>R"z| ^ŔíÇ{ŹŹ[­KŁÝˇo"˘%˘›¸ĚĄ““Ll´Ç<14>ÂäŃbdďÔš7yvŔ©°•â
"—<>ĘĘ>Y ŃčČpö9&•_}n #ś‡ń*ź\ׇś¸Ő a €Î!Qk­öu?ŐĺO\Érźű ? Ţ­©/Ő<>=w

View file

@ -1 +0,0 @@
xĺ<>Ń €0Cýî™ ?Š3¸ĆµV¨=iOÄí=Ŕü<08>„äă…,ý8tWĆÚ@h*ő‚&R$jĚ*y¶¨Ęs-Üś”Č8v)¶Ňuă§±—ÓV„HęĽ÷żŇ<17>"ťË µćPż

View file

@ -1,3 +0,0 @@
xŤŽK
Â0@]çłd&żi@DčĘcLŇ -XSJŹŻŕÜ>Ţ<>WÚş.,áˇďŞ<C48F>BšX'aRgb‡<62>=ŠËľ:LčS1ěúčBŤĂ 1{Î,ˇČPkńjCf.$5Zks@gäŮç¶Ăx<C482>óx»ę[Öí®§ŇÖ P$ŽLŢ Í—~§şţ©›>/űż
Ú&}é˝mćšľ@;

View file

@ -1,2 +0,0 @@
x<01>ŽM
à F»ö³/G<>?PJ!«C<>Ä”¿<>^ Ûï½_®¥¼:(ÄKoÌÀ1Ÿ²&ã“Ožfãee<‡€Jºœ5‰=6Þ:©!p<>Y»“+ÍȬ3ÚE)-)LŒ"}© Æ îãôäO,ûÊ·\ËТ³<0E>A¸¢”RœëyªóŸº˜ëÑú¿ êÄo^ë.¾<>zA»

View file

@ -1 +0,0 @@
x<01>Ο»j1…αΤϋΣΉ„™4 „€+y† ΛlΦΰ]-B1~ό,„τiΟ<69>΄`ο<>FW}&e#.„•ΕΫσΑ§¬™YR<59><52><04>φΤuΰ„Σ<E2809E>bΡΜΩ%ΡΘ#ΦP©jεƒJεb<CEB5>Ό:1.Έ’ƒ/ΕΔμ<CE94>)Ι2Eδ*†4…(Lι{,­Γω―ηΛ»><3E>Ίίτ¥΄υ'+Ο<CE9F>Σ±'†ώ“OΪΏrO[YΰTυ®·¶<C2B7>ΰΊ<CEB0>m,Ϊ?Ϋτ>ίR¦

View file

@ -1 +0,0 @@
341cf8213827614a274c750cd7dec4307eb41de7

View file

@ -1 +0,0 @@
e563585cb87cc39b553ca421902d631ea8890118

View file

@ -1 +0,0 @@
d3e2708327280097b5e1f8ab69309934b24f8b64

View file

@ -1 +0,0 @@
559043765dc6c32c943b6278b4abbff1e6f52839

View file

@ -1 +0,0 @@
f8dd12b796f400be7f59d9471670c3080f9c90a1

View file

@ -1 +0,0 @@
this is file number 1 that I'm going to cherry-pick

View file

@ -1 +0,0 @@
this is file number 2 that I'm going to cherry-pick

View file

@ -1 +0,0 @@
this is file number 3 that I'm going to cherry-pick

View file

@ -1 +0,0 @@
this is file number 4 that I'm going to cherry-pick

View file

@ -1 +0,0 @@
this is file number 5 that I'm going to cherry-pick

View file

@ -1 +0,0 @@
this is file number 6 that I'm going to cherry-pick

View file

@ -1 +0,0 @@
this is file number 7 that I'm going to cherry-pick

View file

@ -1 +0,0 @@
this is file number 8 that I'm going to cherry-pick

View file

@ -1 +0,0 @@
this is file number 9 that I'm going to cherry-pick

Some files were not shown because too many files have changed in this diff Show more