You could merge the feature branch into master (or whatever), resolve conflicts,...

		pmontra on July 22, 2019 \| parent \| context \| favorite \| on: GitHub is down You could merge the feature branch into master (or whatever), resolve conflicts, commit, push and deploy.