in case of error let user decide if he wants to proceed with accepting two changes together
in case of error let user decide if he wants to proceed with accepting two changes together

rtcTo/rtc2git,jacobilsoe/rtc2git,WtfJoke/rtc2git,cwill747/rtc2git,ohumbel/rtc2git,akchinSTC/rtc2git