Re: 2.43+ git checkout --theirs on stash error - no alternative?
- From
- Devste Devste <devstemail@gmail.com>
- Date
- Nov 4, 2024, 10:09 UTC
- Message-ID
- <CANM0SV3vNBwoNw08AevHE-3cOjUTG4AGVJdpwfKCr=CX5DSW8w@mail.gmail.com>
- In-Reply-To
- <Zx7O3VsZX2B9d9qN@nand.local>
"--theirs" was necessary since I want the file exactly as it is in the stash - any conflicts from applying the file from stash should be automatically resolved using the hunk from the stash
On Mon, 28 Oct 2024 at 00:38, Taylor Blau <me@ttaylorr.com> wrote:
Show 16 quoted lines
>
> On Sun, Oct 27, 2024 at 11:31:05PM +0100, Devste Devste wrote:
> > Turns out the previous behavior can be achieved with
> > git restore --source='stash@{0}' -- "some-file.txt"
>
> Hmm. What you wrote above here makes sense, but I agree with the
> original change from Junio (CC'd) that using `--theirs` does not make
> sense when the source is a tree-ish and not the index directly.
>
> This is different, though, since here you are just trying to check out
> the contents of some-file.txt at stash@{0}, without `--theirs`. What did
> you mean in the previous example, and why was `--theirs` necessary in
> the call there?
>
> Thanks,
> Taylor