[20:46:16] <MirahezeRelay>	 <pixldev> hey chat how does one resolve a merge conflict https://github.com/miraheze/CreateWiki/compare/master...pixDeVl:CreateWiki:master
[21:01:18] <MirahezeRelay>	 <rhinosf1, replying to pixldev> https://github.com/miraheze/CreateWiki/pull/605/conflicts
[21:03:12] <MirahezeRelay>	 <pixldev> not sure how ive never had to resolve one of these
[22:05:09] <MirahezeRelay>	 <originalauthority> You need to check out the PR locally
[22:05:22] <MirahezeRelay>	 <originalauthority> And then trowl through the conflict and fix it
[22:05:41] <MirahezeRelay>	 <originalauthority> (Reason no 1 gitlab is better: you can fix merge conflicts on gitlab without doing all this shit)
[22:07:36] <MirahezeRelay>	 <pixldev, replying to originalauthority> What appeases git
[22:21:17] <MirahezeRelay>	 <originalauthority> not much
[22:32:45] <MirahezeRelay>	 <pixldev, replying to originalauthority> in this case