Re: git/lib and git/git-gui/lib merge mis-hap?

"Shawn O. Pearce" [off-list ref] writes:

Andreas Ericsson [off-list ref] wrote:

quoted

Settling down to get some libgit2 hacking done (adding build-rules
to git.git), I noticed that there's a file in git.git called
lib/remote_add.tcl, which looks as if it belongs in git-gui/lib.

I don't know how this happened, but since I assume it's subtree
merged (thus requiring more work to correct than a simple patch),
it would be nifty if it could get corrected so as to make space
for the up-and-coming git library :-)

That was a bad merge of git-gui on my part.  I thought it was fixed.
It only happened in next, and was there only for a day before
someone pointed it out to me, and I fixed it in the tree.

You seem to have further changes to the master branch of git-gui.  Would
it be a good time to pull for me?  The same question goes to maint as
well.

Junio C Hamano [off-list ref] wrote:

You seem to have further changes to the master branch of git-gui.  Would
it be a good time to pull for me?  The same question goes to maint as
well.

Yup.  I was getting ready to ask you to pull.

Can you pull maint and master?

:-)

-- 
Shawn.