On Sun, Mar 8, 2009 at 4:49 AM, Daniel Barkalow <barkalow@xxxxxxxxxxxx> wrote: > On Sun, 8 Mar 2009, Junio C Hamano wrote: > >> Jay Soffian <jaysoffian@xxxxxxxxx> writes: >> >> > This series and js/remote-improvements (e5dcbfd) in pu may not get >> > along completely. "git remote show" tries to show how the refspecs >> > expand out. >> >> I've created an "early semantic conflict resolution" topic branch that is >> a cross between this series and js/remote-improvements, like so: >> >> $ git checkout -b xx/db-refspec-vs-js-remote db/refspec-wildcard-in-the-middle >> $ git merge js/remote-improvements >> $ git apply evil-fixup.diff >> $ git commit --amend -a -m "Evil merge." >> >> with the following "fixup-as-an-evil-merge patch", which I'd appreciate if >> you two can sanity check. > > That looks like what I'd come up with as a resolution, too, so I think > it's sane unless Jay knows of another way to get remote to care about > patterns. Looks good to me too. j. -- 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
