Dear diary, on Sat, Aug 13, 2005 at 04:45:32PM CEST, I got a letter
where Kenneth Johansson <[EMAIL PROTECTED]> 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 /^<<<<<<</ lines (that's what CVS does)
        +: User does not need to take an explicit action to indicate
           resolved conflict.
        -: False positives if the file with conflict contains that
           string naturally.

* Make auxiliary files and check for their existence (what SVN does)
        +: User can use the auxiliary files (usually containing the
           to-be-merged revisions) for better conflict resolution,
           or run some own merging tool on it later.
        -: Extremely rare false positives.
        -: User needs to explicitly get rid of the files to get rid
           of the conflict.

* Keep the conflict recorded in index
        +: No junk in working directory, cg-status should start working
           right away.
        -: Unknown caveats wrt. index files containing conflicts...?
        -: User needs to explicitly run cg-resolve or something to
           get rid of the conflict.

Ideas? Opinions?

                                Petr "Pasky" Baudis
If you want the holes in your knowledge showing up try teaching
someone.  -- Alan Cox
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to