Re: kha/safe and kha/experimental updated

"Catalin Marinas" [off-list ref] writes:

On 18/12/2007, Jakub Narebski [off-list ref] wrote:

quoted

"Catalin Marinas" [off-list ref] writes:

quoted

Thanks again for maintaining these branches.

On 18/12/2007, Karl Hasselström [off-list ref] wrote:

quoted

  git://repo.or.cz/stgit/kha.git safe

quoted

quoted

      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).

I'd also like to re-add the stgit.keeporig option and additional
functionality so that the *.{ancestor,current,patched} can be left in
the working tree. Some people might use them when manually fixing
conflicts (I have a look at them from time to time when the emacs +
ediff shows a hard to understand conflict).

Since all the information is in git, it is of course easy to recreate
it. But the important question to ask is: how do you use these extra
files? git.el provides a way to diff against both parent versions, and
maybe that is actually what you need.

I don't mind that you want these files, but they are mostly clutter to
me.

-- 
David Kågedal