Since the first repo is private I added myself as a collab so I could work
with it. You can remove me from the repo now. The issue was that you had a
remnant of a submodule at thesis/, which was blocking your merge. Here's a
transcript of my console session: http://gist.github.com/255943 You can
find the merged repo in my fork of your repo.
On a side note, your repos are *massive*. It looks like you've committed
some eps, pdf and zip files. These things usually don't version well, and
you don't seem to be changing them anyway. I would recommend you excise
them from the repo's history and save them somewhere outside of the repo.
It'll make things much easier in the end if you keep your repos lean.
Tekkub
GitHub Tech Support
http://support.github.com/
Join us on IRC: #github on freenode.net
Discussion group: [email protected]
On Sat, Dec 12, 2009 at 12:59 AM, JoVo <[email protected]> wrote:
> repo1: https://github.com/jovo/meta-oopsi
> repo2: https://github.com/jovo/thesis-oopsi/
>
>
> i would love for repo2 to be merged into repo1 as meta-oopsi/thesis
>
> locally, repo2 is the archive of a sub-directory within the directory
> that repo1 is an archive for. ie, the folder hierarchy is meta-oopsi/
> thesis, and repo1 lives in meta-oopsi/.git and repo2 lives in meta-
> oopsi/thesis/.git
>
> is that clear?
>
> many thanks, joshua
>
>
> On Dec 11, 7:12 pm, Tekkub <[email protected]> wrote:
> > Could you give me links to the two repos, and describe exactly where you
> > want the repos merged at (repo2 merged into repo1 as some/path/repo2)?
> >
> > Tekkub
> > GitHub Tech Support
> > http://support.github.com/
> > Join us on IRC: #github on freenode.net
> > Discussion group: [email protected]
> >
> >
> >
> > On Fri, Dec 11, 2009 at 6:13 PM, JoVo <[email protected]> wrote:
> > > i did this:
> >
> > > jovo:~/Research/oopsi% mkdir test
> > > jovo:~/Research/oopsi% cd test
> > > jovo:Research/oopsi/test% git init
> > > Initialized empty Git repository in .git/
> > > jovo:Research/oopsi/test% touch .gitignore
> > > jovo:Research/oopsi/test% git add .gitignore
> > > jovo:Research/oopsi/test% git commit -m'initial commit'
> > > Created initial commit bfe6cee: initial commit
> > > 0 files changed, 0 insertions(+), 0 deletions(-)
> > > create mode 100644 .gitignore
> >
> > > that's good.
> >
> > > then this:
> >
> > > jovo:Research/oopsi/test% git remote add -f meta-oopsi git://
> > > github.com/jovo/meta-oopsi
> > > fatal: The remote end hung up unexpectedly
> > > fetch meta-oopsi: command returned error: 128
> >
> > > that's bad.
> >
> > > since the repo's are local, i did this:
> >
> > > jovo:Research/oopsi/test% git fetch ../meta-oopsi
> > > warning: no common commits
> > > remote: Counting objects: 2658, done.
> > > remote: Compressing objects: 100% (2307/2307), done.
> > > remote: Total 2658 (delta 711), reused 963 (delta 332)
> > > Receiving objects: 100% (2658/2658), 583.85 MiB | 3209 KiB/s, done.
> > > Resolving deltas: 100% (711/711), done.
> >
> > > that's good.
> >
> > > then i did this:
> >
> > > jovo:Research/oopsi/test% git merge -s ours --no-commit meta-oopsi/
> > > master
> > > meta-oopsi/master - not something we can merge
> >
> > > that's bad.
> >
> > > thoughts?
> >
> > > On Dec 11, 3:07 pm, Tekkub <[email protected]> wrote:
> > > > Try doing this in a fresh clone, you're probably running into a
> conflict
> > > > with how you had the repo previously set up.
> >
> > > > Tekkub
> > > > GitHub Tech Support
> > > > http://support.github.com/
> > > > Join us on IRC: #github on freenode.net
> > > > Discussion group: [email protected]
> >
> > > > On Fri, Dec 11, 2009 at 12:46 AM, JoVo <[email protected]> wrote:
> > > > > tekkub, thanks for the response. both repo's are pushed to github
> > > > > already, and if i somehow lose some history from either, its really
> > > > > not a big deal, although it'd be nice to keep.
> >
> > > > > so, i kinda see what you mean. i am looking to the subtree merge
> > > > > option. but i'm a little confused about implementation in my
> > > > > particular scenario, as i have one repo for the directory meta, and
> > > > > another for the sub-directory meta/thesis. i tried to follow the
> > > > > instructions from the link, but sadly, they did not work for me :(
> >
> > > > > in particular, i am in ~/meta, which already has a repo with a long
> > > > > commit history. thus, i start with:
> >
> > > > > jovo:Research/oopsi/meta-oopsi% git remote add -f thesis
> > > > > git://github.com/jovo/thesis.git
> > > > > remote thesis already exists.
> >
> > > > > which i take as a good sign. then, i do and get this:
> >
> > > > > jovo:Research/oopsi/meta-oopsi% git merge -s ours --no-commit
> thesis/
> > > > > master
> > > > > thesis/master - not something we can merge
> >
> > > > > trying to add or remove a '/' here and there doesn't change
> anything,
> > > > > neither does including/excluding 'master'
> >
> > > > > thus, i'm stuck. little help? many thanks, jovo
> >
> > > > > On Dec 3, 7:16 pm, Tekkub <[email protected]> wrote:
> > > > > > First and foremost, if the local repos are the only copies you
> have,
> > > I
> > > > > would
> > > > > > back them up or push them to github. Take a step back, clone the
> > > repos
> > > > > to a
> > > > > > new path, and work from there with a fresh start.
> >
> > > > > > What you're looking at here is basically submodules vs subtree
> merge.
> > > Do
> > > > > > you want the repos to maintain separate histories but still be
> linked
> > > > > > together, essentially making one a plugin of the other... or do
> you
> > > want
> > > > > to
> > > > > > completely merge the repos and their histories together, creating
> a
> > > > > single
> > > > > > repo from that point on. If you want to keep them separate, then
> you
> > > > > want
> > > > > > git-submodule. If you want to merge them, you want subtree
> merge.
> >
> > > > > > Submodules:
> > > > >http://www.kernel.org/pub/software/scm/git/docs/git-submodule.html
> > > > > > Subtree merge: http://help.github.com/subtree-merge/
> >
> > > > > > Tekkub
> > > > > > GitHub Tech Support
> > > > > > http://support.github.com/
> > > > > > Join us on IRC: #github on freenode.net
> > > > > > Discussion group: [email protected]
> >
> > > > > > On Thu, Dec 3, 2009 at 7:29 PM, JoVo <[email protected]> wrote:
> > > > > > > i have the following folder hierarchy: meta/thesis
> >
> > > > > > > i had a repo for 'meta', and another for 'meta/thesis'. i
> > > continually
> > > > > > > updated the thesis repo, but not the 'meta' repo. just
> recently, i
> > > > > > > decided to update the meta repo. but, i wanted to include the
> > > commit
> > > > > > > history from the thesis repo. so, when in the meta dir, i
> simply
> > > > > > > called 'git pull thesis'
> >
> > > > > > > to my surprise, this put copies of all the subfolders within
> thesis
> > > > > > > into meta, ie, before i had meta/thesis/a and meta/thesis/b,
> and
> > > now i
> > > > > > > also had meta/a and meta/b. so, i deleted the redundant
> folders,
> > > and
> > > > > > > did a commit from the meta folder. when i pushed to github,
> the
> > > > > > > 'thesis' folder in meta had a funny icon, and listed the commit
> id
> > > > > > > from the 'thesis' repo.
> >
> > > > > > > so, i would love to delete the thesis repo, both locally and
> > > remotely,
> > > > > > > and still keep the commit history in the 'meta' repo, and have
> it
> > > > > > > available remotely. if i do a 'rm -rf /thesis/.git', and
> delete
> > > it
> > > > > > > remotely, will i lose the commit history from the 'thesis'
> repo?
> >
> > > > > > > many thanks,
> > > > > > > JoVo
> >
> > > > > > > --
> >
> > > > > > > You received this message because you are subscribed to the
> Google
> > > > > Groups
> > > > > > > "GitHub" group.
> > > > > > > To post to this group, send email to [email protected].
> > > > > > > To unsubscribe from this group, send email to
> > > > > > > [email protected]<github%[email protected]>
> <github%[email protected]<github%[email protected]>
> >
> > > <github%[email protected]<github%[email protected]>
> <github%252bunsubscr...@googlegroups. com>
> >
> > > > > <github%[email protected]<github%[email protected]>
> <github%252bunsubscr...@googlegroups. com>
> > > <github%252bunsubscr...@googlegroups. com>
> >
> > > > > > > .
> > > > > > > For more options, visit this group at
> > > > > > >http://groups.google.com/group/github?hl=en.
> >
> > > > > --
> >
> > > > > You received this message because you are subscribed to the Google
> > > Groups
> > > > > "GitHub" group.
> > > > > To post to this group, send email to [email protected].
> > > > > To unsubscribe from this group, send email to
> > > > > [email protected]<github%[email protected]>
> <github%[email protected]<github%[email protected]>
> >
> > > <github%[email protected]<github%[email protected]>
> <github%252bunsubscr...@googlegroups. com>
> >
> > > > > .
> > > > > For more options, visit this group at
> > > > >http://groups.google.com/group/github?hl=en.
> >
> > > --
> >
> > > You received this message because you are subscribed to the Google
> Groups
> > > "GitHub" group.
> > > To post to this group, send email to [email protected].
> > > To unsubscribe from this group, send email to
> > > [email protected]<github%[email protected]>
> <github%[email protected]<github%[email protected]>
> >
> > > .
> > > For more options, visit this group at
> > >http://groups.google.com/group/github?hl=en.
>
> --
>
> You received this message because you are subscribed to the Google Groups
> "GitHub" group.
> To post to this group, send email to [email protected].
> To unsubscribe from this group, send email to
> [email protected]<github%[email protected]>
> .
> For more options, visit this group at
> http://groups.google.com/group/github?hl=en.
>
>
>
--
You received this message because you are subscribed to the Google Groups
"GitHub" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/github?hl=en.
