3 ms·You could merge the feature branch into master (or whatever), resolve conflicts, commit, push and deploy.by pmontra 7y agoYou could merge the feature branch into master (or whatever), resolve conflicts, commit, push and deploy.