Re: kha/safe and kha/experimental updated
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Dec 18, 2007, 16:39 UTC
- Message-ID
- <m3hcigot3h.fsf@roke.D-201>
- In-Reply-To
- <b0943d9e0712180809l4d2d01b8j32ab2a410885cc5e@mail.gmail.com>
"Catalin Marinas" <catalin.marinas@gmail.com> writes:
> Thanks again for maintaining these branches. > > On 18/12/2007, Karl Hasselström <kha@treskal.com> wrote: > > git://repo.or.cz/stgit/kha.git safe
Show 6 quoted lines
> > 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