• dblsaiko@discuss.tchncs.de
    link
    fedilink
    arrow-up
    2
    ·
    9 hours ago

    https://git-man-page-generator.lokaltog.net/

    Oh my god this is amazing. Thanks for this.

    what happens when you merge two branches of a repo which has several changed submodules in each branch?

    I would assume a merge conflict if the submodules were changed in both branches from the base… but it’s probably not that simple, is it? I’ve never tested it.