How can I merge two branches with magit interactively line by line. Important there is no conflict (well ONLY for git it isn't) but I still want to do this.
- Press M-x magit-status
- Press m in magit status
- Activate the "No fast-forward" switch and do Merge but don't commit Action and press m again
- Now your files are changed but not committed, so you can merge them with your last commit state when you press e above the changed files that will bring you ediff and you're able to review the changes
Hope this will help you out.