From: Derrick Stolee Date: Thu, 19 Apr 2018 19:54:36 GMT Subject: Re: [PATCH v10 00/36] Add directory rename detection to git Message-ID: <6f6e57cb-c48c-7e5d-d8da-0d0b0b336971@gmail.com> In-Reply-To: On 4/19/2018 2:41 PM, Stefan Beller wrote: > On Thu, Apr 19, 2018 at 11:35 AM, Elijah Newren wrote: >> On Thu, Apr 19, 2018 at 10:57 AM, Elijah Newren wrote: >>> This series is a reboot of the directory rename detection series that was >>> merged to master and then reverted due to the final patch having a buggy >>> can-skip-update check, as noted at >>> https://public-inbox.org/git/xmqqmuya43cs.fsf@gitster-ct.c.googlers.com/ >>> This series based on top of master. >> ...and merges cleanly to next but apparently has some minor conflicts >> with both ds/lazy-load-trees and ps/test-chmtime-get from pu. >> >> What's the preferred way to resolve this? Rebase and resubmit my >> series on pu, or something else? > If you were to base it off of pu, this series would depend on all other > series that pu contains. This is bad for the progress of this series. > (If it were to be merged to next, all other series would automatically > merge to next as well) > > If the conflicts are minor, then Junio resolves them; if you want to be > nice, pick your merge point as > > git checkout origin/master > git merge ds/lazy-load-trees > git merge ps/test-chmtime-get > git tag my-anchor > > and put the series on top of that anchor. > > If you do this, you'd want to be reasonably sure that > those two series are not in too much flux. I believe ds/lazy-load-trees is queued for 'next'. I'm not surprised that there are some conflicts here. Any reference to the 'tree' member of a commit should be replaced with 'get_commit_tree(c)', or 'get_commit_tree_oid(c)' if you only care about the tree's object id. I think Stefan's suggestion is the best approach to get the right conflicts out of the way. Thanks, -Stolee