* Reply using the -to, -cc, and -in-reply-to * Save the following mbox file, import it into your mail client,Īvoid top-posting and favor interleaved quoting: You may reply publicly to this message via plain-text email 22:58 Stash pop/apply conflict and -theirs and -ours Sven Strickroth Thread overview: 2+ messages / expand mbox.gz Atom feed top I'm still not convinced it's a good idea, though. "2" bits in the index after the conflicted merge completes. Side represents the current working tree, so we might do things likeĬheck whether the index is fresh). The unpack-trees codeĭoes not treat "ours" and "theirs" entirely symmetrically (the "ours" Suspect it may be hard to implement in practice. Some kind of option (and things like pull autostash could use it), but I Would be the right thing to do in all cases. So I sympathize, but I don't think that having "stash" flip the order Then conceptually the stash is "ours" and HEAD is "theirs". I guess if you are stashing in order to pull somebody else's work, like: If we merge, then -theirs is the branch we are merging: Is true of "stash", too (I basically think of "stash apply" as a That is true of "merge" and "cherry-pick". Operation started, and "theirs" is what the operation is bringing into The "ours" content is generally what was in the HEAD before the I don't think anybody has ever mentioned it for stash. I know that people have complained about "rebase" swapping the two, but > From the HCI perspective this is really counter intuitive. > -ours and -theirs are swapped when a conflict occurrs on git stash > I regularly experience that beginners have problems unterstanding that On Sun, at 12:58:12AM +0200, Sven Strickroth wrote: Subject: Re: Stash pop/apply conflict and -theirs and -oursĭate: Sun, 05:30:32 -0400 Re: Stash pop/apply conflict and -theirs and -ours - Jeff King mailing list mirror (one of many) help / color / mirror / code / Atom feed From: Jeff King
0 Comments
Leave a Reply. |
Details
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |