[tpm] [OT] Git repo combination

Antonio Sun antoniosun at lavabit.com
Thu Jan 17 13:29:09 PST 2013

On Thu, Jan 17, 2013 at 4:11 PM, Abram Hindle <
abram.hindle at softwareprocess.es> wrote:

> Here's a textual demo and I've attached a typescript. In this session I
> merge proj1 into a subdir of proj2.

Thanks a million Abram!

Just FTR, I tried "git pull" as well, but get this. :-)

$ git pull
 * [new branch]      master     -> origin/master
You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me, either.

Your typescript is really helpful.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.pm.org/pipermail/toronto-pm/attachments/20130117/5e371d78/attachment.html>

More information about the toronto-pm mailing list