On 27.08.2017 06:00, Daniel Shahaf wrote: > Branko Čibej wrote on Sun, 27 Aug 2017 02:09 +0200: >> On 27.08.2017 02:04, Daniel Shahaf wrote: >>> P.S. I think brane's suggestion would make the "edit patch #2 in a 5-patch >>> series" >>> use-case a lot easier: diff3 is exactly the right tool for rebasing patch >>> #3 on top >>> of the edited #2. >> Yes, that's one of the reasons I proposed storing whole files instead of >> patches. Rebasing and reordering would become much simpler (although not >> exactly "simple" if we take tree restructuring into account). > The part with tree restructuring would "simply" require a working diff3 > implementation for tree changes. Isn't that exactly what the tree > conflicts work is supposed to produce?
I was wondering about that, yes. Not sure how one would combine (un)shelving and conflict resoiltion, but clearly it must be possible somehow. -- Brane
