Master

merge my branch to the mcbm fork master

Hi @omveer.rs_AT_amu.ac.in

Sorry, it seems there is something I will have to fix concerning the settings so that your pipeline starts.

Hum, I added the permission for the runner but it doesn't seem to fix the pipeline.

Could you please try the following changes (which would anyway be needed to remove a "loop" in the history):

1. In your local copy, remove the top commit which is a "merge" commit and introduced a loop and an unneeded copy of your change with the following command

   git reset --hard HEAD^

2. Force push to overwrite the remote history (as we make it as if this commit never existed).

   git push --force-with-lease

   • For this to work, you may have to remove the protection of your master branch in Gitlab under Settings (bottom of left menu bar) > Repository > Protected branches
   • I think this protection + Gitlab "features" are the reason why you got the merge commit: after a rebase, one need to use a force push, otherwise Gitlab answers with a message warning that local and remote history are different and asking you to pull first. Do not worry, this happened to many of us at least once, myself included
   • Another setting which may help here is in Settings (bottom of left menu bar) > General > Merge Requests > Merge method to set it as Fast-forward merge instead of Merge commit

I hope that the change would be detected as a new commit and would retrigger the pipeline.

Sorry again for some of this confusion, as you are the first one trying this merge you are unfortunately getting all the unknown problems.

Closing as it was decided in the software meeting to take steps to re-enable the use of the main master again.

I will add in the corresponding MR #360 the instructions to revert part of what we did and be back on track for merging there. Please ignore my previous comment.

Sorry for the extra unnecessary work.

closed