File tree 1 file changed +1
-1
lines changed
book/07-git-tools/sections
1 file changed +1
-1
lines changed Original file line number Diff line number Diff line change @@ -466,7 +466,7 @@ You have to do some extra steps if you want changes in a submodule to be tracked
466
466
467
467
In order to set up your submodule to be easier to go in and hack on, you need to do two things.
468
468
You need to go into each submodule and check out a branch to work on.
469
- Then you need to tell Git what to do if you have made changes and then `git submodule update --remote` pulls in new work from upstream.
469
+ Then you need to tell Git what to do if you have made changes and later `git submodule update --remote` pulls in new work from upstream.
470
470
The options are that you can merge them into your local work, or you can try to rebase your local work on top of the new changes.
471
471
472
472
First of all, let's go into our submodule directory and check out a branch.
You can’t perform that action at this time.
0 commit comments