6 Commits

Author	SHA1	Message	Date
Jesse Duffield	a82134f41c	Fix race condition ... Our refresh code may try to push a context. It does this in two places: 1) when all merge conflicts are resolved, we push a 'continue merge?' confirmation context 2) when all conflicts of a given file are resolved and we're in the merge conflicts context, we push the files context. Sometimes we push the confirmation context and then push the files context over it, so the user never sees the confirmation context. This commit fixes the race condition by adding a check to ensure that we're still in the merge conflicts panel before we try escaping from it	2023-05-16 21:01:38 +10:00
Jesse Duffield	fc91ef6a59	standardise helper args	2023-04-30 13:19:53 +10:00
Jesse Duffield	43251e7275	split context common from helper common	2023-04-30 13:19:53 +10:00
Jesse Duffield	509e3efa70	lots more refactoring	2023-04-30 13:19:53 +10:00
Jesse Duffield	8edad826ca	Begin refactoring gui ... This begins a big refactor of moving more code out of the Gui struct into contexts, controllers, and helpers. We also move some code into structs in the gui package purely for the sake of better encapsulation	2023-04-30 13:19:52 +10:00
Jesse Duffield	7410acd1aa	move merge conflicts code into controller	2022-08-07 11:16:03 +10:00