Closed nils-ohlmeier closed 7 years ago
Whats the procedure for resolving conflicts? Maybe it would be easiest to rebase changes into this branch?
I just used the web editor for the first time. Let's wait for the CI results to be sure I haven't messed things up :)
Whats the procedure for resolving conflicts? Maybe it would be easiest to rebase changes into this branch?