Hi Amin,

You an try using a patch: git format-patch and git am.

While you're trying to fix it, you might want to think about creating a
unidirectional flow strategy.

Either commit in the big repo and trigger spliting it to small repos by
running git subtree for each new commit.
Or commit in the small repos and trigger updates in the big repo using git
submodules.

Regards,
Alex

On Thu, Jul 6, 2017 at 12:19 AM, Amin <amin.band...@gmail.com> wrote:

> Hi all,
>
> A while ago I used git-subtree to break off a sub-directory into its own
> branch:
>
>     git subtree split -P libs/invariants -b separate_invariants
>
> Then I pulled the new `separate_invariants` branch into a new
> repository and made a few commits to it.
>
> My question is, is there anyway I can merge the new commits from the new
> repository back into the original one?
>
> I'd like to merge the new commits (after the split) made to the new
> repository back into the libs/invariants sub-directory of the original
> repository, but the problem is that due to using `git subtree split`, the
> new repository doesn't share any history with the original one, so I can't
> just do normal rebasing or merging.
>
> I'd appreciate any help with my question.
>
> Thanks,
> Amin
>
> --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to