Closed dimpase closed 3 years ago
the conflict is due to the revert. One can clean up the history by doing
git checkout -b back_to_pre_PR 58e3e94759ce77df0be6e121303619f717ce34ea
git push origin HEAD:master -f
This will rewind the master branch back to commit 58e3e94759ce77df0be6e121303619f717ce34ea which would then cleanly merge with my PR.
Or you can revert the revert and cherry-pick my latest commit.
We do it for all the gfortran targets. If gfortran is not there the rule will be ignored.