28 Commits

Author	SHA1	Message	Date
Jesse Duffield	dd1bf629b8	migrate patch building tests	2023-02-25 21:37:16 +11:00
Jesse Duffield	7410acd1aa	move merge conflicts code into controller	2022-08-07 11:16:03 +10:00
Jesse Duffield	3bf0c9ef44	more documentation	2022-05-07 16:02:04 +10:00
Ryooooooga	3b5a019e1a	feat(merge_panel): Add open/edit files in merge conflict panel	2022-04-06 08:27:03 +10:00
Jesse Duffield	a34bdf1a04	update linters	2022-03-19 12:12:57 +11:00
Jesse Duffield	c084abb378	move more view model logic into the files view model	2022-03-17 19:13:40 +11:00
Jesse Duffield	84a1992055	better locking of merge panel state	2022-01-27 21:25:04 +11:00
Jesse Duffield	c8cc18920f	improve merge conflict flow	2022-01-26 14:50:47 +11:00
Jesse Duffield	44d08edfb0	Address feedback	2021-08-25 22:23:55 +10:00
Jesse Duffield	f08fdb2873	Minor refactor	2021-08-25 22:23:55 +10:00
Ryooooooga	6ca42ff720	Fix pick all hunks	2021-08-25 22:23:55 +10:00
Ryooooooga	a533f8e1a5	simplify merge panel logic	2021-08-25 22:23:55 +10:00
Ryooooooga	cf8ded0b79	add mergeConflict#hasAncestor	2021-08-25 22:23:55 +10:00
Ryooooooga	73548fa15f	Fix conflict resolution	2021-08-25 22:23:55 +10:00
Ryooooooga	a0e7604f61	Support git config merge.conflictStyle diff3	2021-08-25 22:23:55 +10:00
Ryooooooga	0af0e66586	Fix panic in merge conflict	2021-08-21 18:34:30 +09:00
Jesse Duffield	d626bcac00	color fixups	2021-08-01 16:14:56 +10:00
Jesse Duffield	117c0bd4f7	simplify code a bit	2021-07-31 17:33:13 +10:00
mjarkk	79848087bc	Switch to github.com/gookit/color for terminal colors	2021-07-30 15:14:46 +02:00
Jesse Duffield	6d91661d5e	prevent closure issue	2021-06-05 13:54:05 +10:00
Jesse Duffield	90983aae65	not importing regexp	2021-06-05 13:53:25 +10:00
Jesse Duffield	f71b23b890	more explicit	2021-06-05 13:53:25 +10:00
Cristian Betivu	05a23f0e1e	Discard value after END marker	2021-06-05 13:53:25 +10:00
Cristian Betivu	fd38ad8096	More generic merge conflict detection	2021-06-05 13:53:25 +10:00
Jesse Duffield	258eedb38c	refactor	2021-06-02 20:33:52 +10:00
Harrison Jones	e478c254d4	Handle alternate merge conflict format; add tests	2021-05-30 13:50:42 +10:00
Jesse Duffield	98375dc902	refactor merge panel	2021-04-18 18:58:09 +10:00
Jesse Duffield	eeeef9ca86	refactor	2021-04-02 11:09:12 +11:00