Second method: the developer ensures that latest code from the release branch is merged into the feature branch and resolves the conflicts themselves.How to use Git efficiently13K62Aditya SridharAndre FerraroFollowSep 1, 2018 · 1 min readI prefer this too.