On Mittwoch, 17. September 2008, Alexander Gavrilov wrote: > On Wed, Sep 17, 2008 at 3:40 PM, Johannes Sixt <johannes.sixt@xxxxxxxxxx> wrote: > > 1. The inability to stage a conflicted file by clicking the icon is > > *very* disruptive. The new menu entry "Stage Working Copy" is > > really only a workaround, and it shows. > > I can see two ways to fix it: > > 1) Allow that icon to work only if the diff is currently displayed, > and also ask for confirmation if there are any conflict markers > present. Good. > Problem: What should it do with modify/delete conflicts, which > don't have any conflict markers? Stage the file, i.e. pick the 'modify' part (perhaps with confirmation). Rationale: That's what the user sees in the diff pane. Additionally, keep the "Use local/remote version" entries so that the 'delete' part can be chosen from the context menu. > 2) Much harder: implement complete one-click undo. This involves > saving information from the index somewhere, and forcing such items to > remain in the 'staged' list, even if the index isn't different from > the tree version any more. > > By the way, is there a simple way to re-create a conflict file from > the saved multistage index entries? There's 0cf8581e (checkout -m: recreate merge when checking out of unmerged index) in 'next'. But that does not address how the unmerged entries get into the index. -- Hannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
