"Catalin Marinas" <catalin.marinas@xxxxxxxxx> writes: > Thanks again for maintaining these branches. > > On 18/12/2007, Karl Hasselström <kha@xxxxxxxxxxx> wrote: > > git://repo.or.cz/stgit/kha.git safe > > Remove "stg resolved" > > I'd like to keep this command. git-mergetool doesn't support the tool > I use (emacs + ediff and more stgit-specific file extensions like > current, patch etc.). I also don't find 'git add' to be meaningful for > marking a conflict as solved. I also would like to have this command kept (and shown in 'stg help'!). Contrary to 'git add' it can check and add to index / update index only for files with conflict; we have -r (ancestor|current|patched) to choose one side, and we could add --check to check if there are no conflict markers with files (useful with -a/--all). -- Jakub Narebski Poland ShadeHawk on #git - 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
