"Glen Choo via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > = Interactions with other series > > This would have been rebased onto ab/submodule-cleanup, but it's not yet > clear to me if that series will be merged first. That series is almost done, > but Ævar is still doing some digging on SUPPORT_SUPER_PREFIX [3] and may > come back with findings that affect this series. > > Fortunately, this series is only tangentially related to > ab/submodule-cleanup, and the conflicts are quite simple: > > | this | ab/submodule-cleanup | resolution | > |-----------------------------+-------------------------------+---------------------------| > | push --super-prefix arg | add new "ud" var | keep both | > |-----------------------------+-------------------------------+---------------------------| > | remove "--recursive-prefix" | add "--checkout", "--rebase", | keep both | > | | "--merge" | | > |-----------------------------+-------------------------------+---------------------------| > | add SUPPORT_SUPER_PREFIX | remove SUPPORT_SUPER_PREFIX | keep > ab/submodule-cleanup | | to "git submodule--helper | from "git > submodule--helper" | | | update" | | | Hm, maybe I'm not using GGG correctly, but these whitespace issues seem pretty common (Markdown collapsing the whitespace maybe?). Maybe I need to blockquote the monospaced stuff. Here's the original table: | this | ab/submodule-cleanup | resolution | |-----------------------------+-------------------------------+---------------------------| | push --super-prefix arg | add new "ud" var | keep both | |-----------------------------+-------------------------------+---------------------------| | remove "--recursive-prefix" | add "--checkout", "--rebase", | keep both | | | "--merge" | | |-----------------------------+-------------------------------+---------------------------| | add SUPPORT_SUPER_PREFIX | remove SUPPORT_SUPER_PREFIX | keep ab/submodule-cleanup | | to "git submodule--helper | from "git submodule--helper" | | | update" | | | (For the org-mode users: org-table-align fixes everything except the last row, presumably because of the rogue line breaks.)
