32 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
friebetill	21d2ea70df	Counteract gravity pull	2023-02-03 16:12:35 +08:00
friebetill	3b8500a9bd	Show a delete modal when all merge conflicts are solved	2023-02-03 12:49:55 +08:00
friebetill	81754da8b9	Fix action button functionality	2023-02-03 00:15:24 +08:00
friebetill	4d0da6425b	Remove more linter warnings	2023-02-02 23:32:22 +08:00
friebetill	a01e69a66f	Follow guide https://bit.ly/3JIZGTE to improve Prettier + ESLint	2023-02-02 22:36:11 +08:00
friebetill	8d864b7d8f	Add command to make merge options explicit ... The merge options are destructive and should only be shown with a warning.	2023-02-02 20:48:52 +08:00
friebetill	457272aafa	Add format command	2023-02-02 18:25:25 +08:00
friebetill	02ab435744	Improve slighty code	2023-02-02 18:25:10 +08:00
friebetill	e4fbea864f	Simplify structure	2023-02-02 18:09:24 +08:00
friebetill	1f55799a1b	Fix color in light mode	2023-02-02 11:50:23 +08:00
friebetill	1dcb0dbc38	Improve the README	2023-02-02 11:50:11 +08:00
Till Friebe	a3e2ef35cc	Tell about the merge options in the README	2023-02-02 11:22:14 +08:00
Till Friebe	14b4fe191b	Add gif to better show functionality of the extension	2023-02-02 03:26:57 +08:00
friebetill	e5c4c54e3e	Display emptys lines correctly	2023-02-02 03:12:38 +08:00
friebetill	c599d57f73	Add note that the extension is not working at the moment	2023-02-02 00:15:11 +08:00
friebetill	a59fc198f3	Fix colors for dark mode	2023-02-01 18:05:33 +08:00
friebetill	45f458bae0	Disable analysis of node_modules folder	2023-02-01 17:58:12 +08:00
friebetill	b6a7ae5428	Show correct diff for the files ... File 1: a b c File 2: b	2023-02-01 17:57:09 +08:00
friebetill	b5b9bbc385	Show only two action buttons with one file change	2023-02-01 15:47:24 +08:00
friebetill	5e0021f2ef	Add functionality to the buttons	2023-01-31 16:38:17 +08:00
friebetill	81c2e0fb68	Show action line	2023-01-29 23:02:40 +08:00
friebetill	4f816cf6c6	Add simple viewer to show the difference	2023-01-28 19:08:58 +08:00
friebetill	1318e87032	Get difference between the two files	2023-01-28 18:20:40 +08:00
friebetill	6ff3d6cf50	Remove active file from selectable files	2023-01-28 17:59:29 +08:00
friebetill	b6d9d69422	Add modal to select file to compare	2023-01-28 17:55:15 +08:00
friebetill	ac8a7dbace	Add README file	2023-01-26 13:50:48 +08:00
friebetill	d85d65f193	Add release script	2023-01-26 13:50:43 +08:00
friebetill	81d47fe2ac	Move main file to src subfolder	2023-01-26 13:50:32 +08:00
friebetill	3b10828d6a	Add lock file	2023-01-26 13:50:04 +08:00
friebetill	c10ef3c9ee	Add license	2023-01-26 13:49:53 +08:00
friebetill	97192233a6	Adjust metadata	2023-01-26 13:49:35 +08:00
Till Friebe	40e4dab9ca	Initial commit	2023-01-26 13:13:41 +08:00