Open martenson opened 8 years ago
What about merge conflicts?
I have fixed the issue with 15.07 -> 15.10 not applying cleanly. Still working on getting 15.10 into 16.01.
@nsoranzo I think the script will create an issue on conflict - and I guess ping someone to fix it. Happy to volunteer.
@nsoranzo I would imagine the bot would open a PR in case merge is clean and send an email to committers otherwise.
Since I also lost a day that I would not have needed to if this was in place - I started hacking on something here https://github.com/jmchilton/galaxy-merger.
always hop one forward? using Jenkins? auto-open PR?
e.g. 15.15>15.07>15.10>16.01>dev