Stream: committers
Topic: Does anyone use GitKraken?
Melva Peters (Mar 24 2021 at 15:43):
I'm trying to deal with a merge conflict for the vscashe file in GitKraken. I don't know how to do that...can anyone help?
Lloyd McKenzie (Mar 24 2021 at 15:54):
@Jean Duteau ?
Lloyd McKenzie (Mar 24 2021 at 15:54):
(My go-to Mac person...)
Jean Duteau (Mar 24 2021 at 16:34):
i use git at the command-line so I'm not much help to Melva (and she reached out to me first).
We really need to figure out how best to handle the merge conflicts on the null.cache files.
Rob Hausam (Mar 24 2021 at 17:52):
I'm also on a Mac and also use the command line normally. But I have GitKraken installed and have used it some. @Melva Peters, if you still have the issue let me know and I will try to help.
Last updated: Apr 12 2022 at 19:14 UTC
