git mergetool meld

2020-05-16 13:16:15 +0200 <illwieckz>	meld is awesome to solve out merge conflict
2020-05-17 02:22:23 +0200 <illwieckz>	`Ishq, I thought I told you to use meld to solve rebase issues: https://dl.illwieckz.net/b/unvanquished/bugs/rmlui-wip/unvanquished_2020-05-17_021854_000.png 👀
2020-05-17 02:27:47 +0200 <illwieckz>	meld is very good to solve merge issue
2020-05-17 02:28:16 +0200 <illwieckz>	http://meldmerge.org/
2020-05-17 02:29:25 +0200 <illwieckz>	when meld does not detect conflict itself, I use this option blindly
2020-05-17 02:30:20 +0200 <illwieckz>	meld: making rebase possible™
2021-03-01 23:42:42 +0100 <illwieckz>	freem: meld is a magic git conflict solver
2021-07-19 18:52:42 +0200 <illwieckz>	note: when dealing with rebase/merge conflict, meld can save your life =)
2021-07-19 18:52:43 +0200 <illwieckz>	note: when dealing with rebase/merge conflict, meld can save your life =)
2021-11-08 23:07:18 +0100 <illwieckz>	can you try meld
2021-11-08 23:07:19 +0100 <illwieckz>	just meld
2021-11-08 23:08:33 +0100 <illwieckz>	I mean, I got the problems you got before I used meld
2021-11-08 23:08:42 +0100 <illwieckz>	and now that I use meld as git mergetool
2021-11-08 23:08:49 +0100 <illwieckz>	I only get this kind of problem once a year
2021-11-09 00:48:06 +0100 <illwieckz>	I still recommend meld for git mergetool
2022-03-26 14:11:09 +0100 <illwieckz>	if I'm right you said you were focusing on the GLM PR only for now. Also I have verified the conflict happening with your PR that modifies the same files is very easy to solve with meld after this one is merged.
2022-08-02 17:12:47 +0200 <illwieckz>	I've told you to use meld
2022-08-02 17:12:55 +0200 <illwieckz>	meld is free
2022-08-02 17:12:57 +0200 <illwieckz>	meld is open source
2022-08-02 17:13:00 +0200 <illwieckz>	meld is available
2022-08-02 17:13:30 +0200 <illwieckz>	when rebasing you don't use “git mergetool” with “meld”