Git submodule merge updated remote submodule into local submodule with local changes

Question

asked Feb 19, 2021 in Technique[技术] by 深蓝 (71.8m points)

Is there a way to pull new changes from a submodule into a local version of that submodule with changes that have been made (essentially do a merge)?

I don't want to make a new branch for the submodule.

与恶龙缠斗过久,自身亦成为恶龙；凝视深渊过久,深渊将回以凝视…

367 views

1 Answer

深蓝 · Answer 1 · 2021-02-19T04:03:38+0000

answered Feb 19, 2021 by 深蓝 (71.8m points)

等待大神答复

与恶龙缠斗过久,自身亦成为恶龙；凝视深渊过久,深渊将回以凝视…