7 Commits

Author	SHA1	Message	Date
Jesse Duffield	790235f64b	add another match on the error message to tell us we've encountered merge conflicts	2019-03-02 21:31:48 +11:00
Jesse Duffield	cb372d469f	fix golangci errors	2019-02-16 21:30:29 +11:00
Jesse Duffield	e011e9bc42	more work on rebasing feature	2019-02-16 21:01:17 +11:00
Jesse Duffield	ad93b4c863	consider whether the view has focus when rendering the contents of a view	2019-02-16 15:17:44 +11:00
Jesse Duffield	75ab8ec4d9	catch rebase errors and show in error panels	2019-02-11 21:29:47 +11:00
Jesse Duffield	a365615490	only use subprocess for merging, not rebasing	2018-12-11 22:16:48 +11:00
Jesse Duffield	9489a94473	Make merge panel its own panel	2018-12-11 22:02:12 +11:00