Hi Thomas, at work we usually do not merge master back into a dev branch, but use 'git rebase -i master'. This will so to say stash any commits on the dev-branch, i.e. roll it back, then apply all changes of master and then apply the stashed changes again. This should allow to bypass any server side checks, which I suppose you are hindered now by. To try this you can git reset --hard <commit-hash> where commit-hash is the last one from the coarray devel branch you want to keep. Be careful and try this only on a copy of the checkout, because reset hard will drop anything without any chance for easy recovery.
- Andre Andre Vehreschild
