# Merge conflict. 2 messages from 2005-08-13 to 2005-08-13. Participants: Kenneth Johansson, Petr Baudis. Thread: https://gitlist.dev/t/1499 ## Kenneth Johansson, 2005-08-13 14:45 Subject: Merge conflict. Message-ID: URL: https://gitlist.dev/e/pan.2005.08.13.14.45.32.401071%40canit.se ``` I used cogito to do a cg-update and got conflicts and the exact files are printed to the screen. But say I somehow lost that output is there anyway to list conflicting files ?? cg-status shows the files as modified but that also includes non conflicting files. The best I could find was to do a "git-update-cache --refresh" but that still do not tell me if I already have removed the conflict in the file. Is this not something that needs to be answered if we ever are going to have a graphical merge tool? ``` ## Petr Baudis, 2005-08-13 16:17 Subject: Re: Merge conflict. Message-ID: <20050813161708.GH5608@pasky.ji.cz> URL: https://gitlist.dev/e/20050813161708.GH5608%40pasky.ji.cz In-Reply-To: ``` Dear diary, on Sat, Aug 13, 2005 at 04:45:32PM CEST, I got a letter where Kenneth Johansson told me that... > I used cogito to do a cg-update and got conflicts and the exact files are > printed to the screen. But say I somehow lost that output is there anyway > to list conflicting files ?? > > cg-status shows the files as modified but that also includes non > conflicting files. > > The best I could find was to do a "git-update-cache --refresh" but that > still do not tell me if I already have removed the conflict in the file. > > Is this not something that needs to be answered if we ever are going to > have a graphical merge tool? Yes, I know about this problem and something should be done about it. The possible approaches: * Check for /^<<<<<<