5 Commits

Author	SHA1	Message	Date
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
Jesse Duffield	3e80a9e886	refactor to group up more commonly used git command stuff	2022-01-18 22:01:09 +11:00
Jesse Duffield	ccf90466fa	fix test	2022-01-09 14:09:53 +11:00
Jesse Duffield	c9a0cc6b30	refactor	2022-01-09 14:09:53 +11:00