On Sun, Dec 30, 2012 at 2:54 PM, Antoine Pelisse <apelisse@xxxxxxxxx> wrote:
> By the way, that merges without conflicts with Adam's series, but it
> will not compile as he renamed functions that I'm now using
> (path_excluded() -> is_path_excluded() that is).
Ah, renames! I forgot about those.
> By the way, Junio, how do you handle this situation as a maintainer ?
> Do you keep a note to manually make the change every time you remerge
> the series together ? That is the kind of use-case you can't handle
> with git-rerere, and I've been trying to find a solution to it.
Not sure if it helps to note that I am already basing my patch series
on top of Junio's nd/attr-match-optim-more branch. Nguyen created
that branch which conflicted with mine, but then resolved the conflicts,
so I am basing mine on his to avoid having to continually resolve the
same conflicts.
So you could take the same approach and rebase yours on top of mine,
e.g.
git remote add junio git://github.com/gitster/git.git
git fetch junio
git rebase junio/as/check-ignore
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html