git diff feature branch with unstaged changes
To integrate changes from branch “feature1” without cherry picking can be done file by file or line by line.
Compare current unstaged changes file-by-file, with the ability to line-by-line implement changes:
git difftool feature1
Whole branch compare does NOT allow line-by-line edits, so perhaps open a second terminal and “git checkout” files from the feature branch as desired.
git difftool -d feature1
Meld and Visual Studio Code are each good GUIs for Git difftool and mergetool.