{"thread":{"id":"1499","subject":"Merge conflict.","startedAt":"2005-08-13T14:45:32Z","lastAt":"2005-08-13T16:17:08Z","messageCount":2,"participants":["Kenneth Johansson","Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"7192","messageId":"pan.2005.08.13.14.45.32.401071@canit.se","threadId":"1499","inReplyTo":null,"subject":"Merge conflict.","fromName":"Kenneth Johansson","fromEmail":"ken@canit.se","sentAt":"2005-08-13T14:45:32Z","receivedAt":"2005-08-13T14:45:32Z","isPatch":false,"sender":{"key":"ken@canit.se","avatar":null},"body":"I used cogito to do a cg-update and got conflicts and the exact files are\nprinted to the screen. But say I somehow lost that output is there anyway\nto list conflicting files ??\n\ncg-status shows the files as modified but that also includes non\nconflicting files.\n\nThe best I could find was to do a \"git-update-cache --refresh\" but that\nstill do not tell me if I already have removed the conflict in the file.\n\nIs this not something that needs to be answered if we ever are going to\nhave a graphical merge tool?\n"},{"id":"7193","messageId":"20050813161708.GH5608@pasky.ji.cz","threadId":"1499","inReplyTo":"pan.2005.08.13.14.45.32.401071@canit.se","subject":"Re: Merge conflict.","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-08-13T16:17:08Z","receivedAt":"2005-08-13T16:17:08Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sat, Aug 13, 2005 at 04:45:32PM CEST, I got a letter\nwhere Kenneth Johansson <ken@canit.se> told me that...\n> I used cogito to do a cg-update and got conflicts and the exact files are\n> printed to the screen. But say I somehow lost that output is there anyway\n> to list conflicting files ??\n> \n> cg-status shows the files as modified but that also includes non\n> conflicting files.\n> \n> The best I could find was to do a \"git-update-cache --refresh\" but that\n> still do not tell me if I already have removed the conflict in the file.\n> \n> Is this not something that needs to be answered if we ever are going to\n> have a graphical merge tool?\n\nYes, I know about this problem and something should be done about it.\nThe possible approaches:\n\n* Check for /^<<<<<<</ lines (that's what CVS does)\n\t+: User does not need to take an explicit action to indicate\n\t   resolved conflict.\n\t-: False positives if the file with conflict contains that\n\t   string naturally.\n\n* Make auxiliary files and check for their existence (what SVN does)\n\t+: User can use the auxiliary files (usually containing the\n\t   to-be-merged revisions) for better conflict resolution,\n\t   or run some own merging tool on it later.\n\t-: Extremely rare false positives.\n\t-: User needs to explicitly get rid of the files to get rid\n\t   of the conflict.\n\n* Keep the conflict recorded in index\n\t+: No junk in working directory, cg-status should start working\n\t   right away.\n\t-: Unknown caveats wrt. index files containing conflicts...?\n\t-: User needs to explicitly run cg-resolve or something to\n\t   get rid of the conflict.\n\nIdeas? Opinions?\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nIf you want the holes in your knowledge showing up try teaching\nsomeone.  -- Alan Cox\n"}]}