merge submodule till specific version with my older version submodule

Question

I want to to merge a submodule till specific commit with the older version sub module which i made commits on and don't want it to get deleted

Make a new branch from the newer branch, and reset to the commit you want to revert to, and then merge on the older branch — Skywalker, Sep 05 '18 at 02:36
There is a problem that when I pull to the branch it will merge with the old commits — A_S, Sep 05 '18 at 03:18
You can try this. This should definitely work in your case and without causing problems on merging. https://stackoverflow.com/a/2816728/5316422 — Skywalker, Sep 06 '18 at 02:01
once you have the new branch, merge to that branch from the submodule branch that you want.. and you will have exactly what you want. then later when you want to merge it all, just merge this branch into main — Skywalker, Sep 06 '18 at 02:02

score 0 · Accepted Answer · answered Sep 06 '18 at 20:03

0

The solution that worked best form me was

git fetch

   git checkout FETCHED_HEAD

    git checkout -b newbranch commitSHA1
    git checkout master
    git merge newbranch

answered Sep 06 '18 at 20:03

A_S

Since your problem has been solved, you can mark the answer. – Marina Liu Sep 09 '18 at 06:23

1 Answers1