[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "
From: |
Eli Zaretskii |
Subject: |
bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file |
Date: |
Wed, 22 Apr 2015 10:35:46 +0300 |
> Date: Wed, 22 Apr 2015 04:50:14 +0300
> From: Dmitry Gutov <dgutov@yandex.ru>
> CC: esr@snark.thyrsus.com, 20292-done@debbugs.gnu.org
>
> On 04/21/2015 04:06 AM, Stefan Monnier wrote:
> >> Then my vote is for using "git add FILE" with conflicts during a
> >> merge, and "git reset HEAD FILE" with conflicts during "stash pop".
> >> I think this is the simplest solution and is easy to implement with
> >> minimal changes.
> >
> > Fine by me,
>
> I've pushed this, together with the choosing logic suggested previously.
> Apparently it's the best we can do.
Thanks, this does TRT in my use cases.
- bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file, (continued)
- bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file, Stefan Monnier, 2015/04/19
- bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file, Eli Zaretskii, 2015/04/20
- bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file, Stefan Monnier, 2015/04/20
- bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file, Eli Zaretskii, 2015/04/20
- bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file, Stefan Monnier, 2015/04/20
- bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file, Dmitry Gutov, 2015/04/21
- bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file,
Eli Zaretskii <=
- bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file, Richard Stallman, 2015/04/22
- bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file, Eli Zaretskii, 2015/04/22
- bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file, Richard Stallman, 2015/04/22
- bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file, Eli Zaretskii, 2015/04/22