How to drop changes to submodule ref from commit during rebase

Question

I'm rebasing my branch on origin/master using

git pull --rebase origin master

Now I get some merge conflicts regarding git submodule updates:

diff --cc cpp_lib
index c14a3fe5,71b17a71..00000000
--- a/cpp_lib
+++ b/cpp_lib
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit c14a3fe5ad7b3034b9744c607c74c19e70b53da6
 -Subproject commit 71b17a718561e8c3ff25523be75c1b36d3a0e585
++Subproject commit f9b7854b5f347be99a265b4acc47b265425380fa

Since I'm not really attached to my changes to the submodule ref I would like to drop the change to the new ref that I introduced and go with their change. So essentially I want to drop out the update to the submodule from the commit's DELTA so there will also be no further merge conflicts. How can I do that?

If you want to rebase on top of an upstream, do not use git pull --rebase, but git fetch + git rebase. The two forms are not equivalent. git pull --rebase contains special/additional logic that could get you to lose local commits, if the remote happens to look as if its history has been re-written by dropping its last commits. For more details, I recommend reading this amazing answer by @BertF stackoverflow.com/questions/78802778/… — dani-vta
– dani-vta, Commented Mar 3 at 13:50

Kiryl Famin · Accepted Answer · 2025-03-03 13:54:02Z

1

git checkout --ours cpp_lib
git add cpp_lib
git rebase --continue

Reset the submodule reference to the upstream version
```
 git checkout --ours cpp_lib
```
Mark the conflict as resolved
```
 git add cpp_lib
```
Continue the rebase
```
 git rebase --continue
```

edited Mar 3 at 13:54

answered Mar 3 at 13:27

Kiryl Famin

1,0706 silver badges20 bronze badges

Sign up to request clarification or add additional context in comments.

3 Comments

dani-vta Mar 3 at 13:44

theirs and ours are swapped during a rebase merge! If OP needs to keep the incoming changes, it should be git checkout --ours ccp_lib

Kiryl Famin Mar 3 at 13:54

@dani-vta thanks, you're absolutely right, I edited my answer

philb Mar 4 at 18:27

> theirs and ours are swapped during a rebase merge! yes, but they are always "swapped" during a rebase, not just during a "rebase merge" (which the OP is not using as far as we know)

Collectives™ on Stack Overflow

How to drop changes to submodule ref from commit during rebase

1 Answer 1

3 Comments

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

3 Comments

Your Answer

Sign up or log in

Post as a guest

Linked

Related