5 Commits

Author	SHA1	Message	Date
Jesse Duffield	c084abb378	move more view model logic into the files view model	2022-03-17 19:13:40 +11:00
Jesse Duffield	8ea7b7a62e	migrate files context to new structure	2022-03-17 19:13:40 +11:00
Jesse Duffield	fa2e7ae1e7	show only merge conflict files when there are merge conflicts	2022-01-26 20:28:32 +11:00
Jesse Duffield	c8cc18920f	improve merge conflict flow	2022-01-26 14:50:47 +11:00
Jesse Duffield	5b7dd9e43c	properly resolve cyclic dependency	2022-01-22 10:48:51 +11:00