Why not just do git merge master from the feature branch? You would end up doing the same amount of merging, if there are any conflicts, as patch --merge, but you'd be doing it with git merge's much more powerful merging capabilities (various merging strategies, options, git mergetool, etc.). And you'd have preserved all the history.
I'm a developer and software architect that's been working with Java , Javascript/Typescript and Python, but I love to learn new stuff and know some other languages, libraries, etc as well.
Why not just do
git merge masterfrom thefeaturebranch? You would end up doing the same amount of merging, if there are any conflicts, aspatch --merge, but you'd be doing it withgit merge's much more powerful merging capabilities (various merging strategies, options,git mergetool, etc.). And you'd have preserved all the history.Good point! I updated the blog post with some reasons why one would not want to use
git merge