gl186 / SprintFinish

Sprint 2 and final assessment project for Group 1 (Module 3 PGCert Clinical Bioniformatics Intro to Programming)
The Unlicense
0 stars 1 forks source link

Already Finished Module 4 but push rejected #16

Open ayurahman opened 8 months ago

ayurahman commented 8 months ago

Hi I need some help pushing the latest module4_VV_VEP_final.py to which branch. Its there on my local remote

ayurahman commented 8 months ago

I have successfully push it to main. Its weird though. I thought we are protecting main and keep the branches open

SonjaR-UniMan commented 8 months ago

Hi, I have encountered this new problem today: Is it the same? ! [remote rejected] HEAD -> Team-3 (protected branch hook declined) error: failed to push some refs to 'https://github.com/gl186/SprintFinish'

But as I am testing for main.pyintegration I am not eager to push to main. I will show my result directly to team in meeting.

gl186 commented 8 months ago

It is a problem with the branch protection I have put. I am editing it now and will let you know if it works.

I am going to still require a pull request to merge but I will allow force pushes to us specifically as a back up. Does that sound reasonable?

gl186 commented 8 months ago

please try and commit and push now. I have set the rules as this:

all branches require pull request to merge no deletions or force push onto main

do we think that is sensible?

Screenshot 2024-02-15 at 09 51 40

Screenshot 2024-02-15 at 09 51 52

ayurahman commented 8 months ago

I wiil try to push to branch Team-4 and will update

ayurahman commented 8 months ago

I have pull the Team-4 branch and then it says all file up to dates. Then I try push the module4_VV_VEP_final.py to the branch it is still giving me the rej3ction as before about the hook thing

ayurahman commented 8 months ago

I think the protection on branch needed to be modified. Just my 2 cents input

gl186 commented 8 months ago

Any suggestions? Force pushes are blocked but pull requests are allowed so I don't see why it won't let you. Maybe commit and then pull request rather than pushing and it will merge the changes?

ayurahman commented 8 months ago

I have not tried that yet for today but will let you know if there is positive result. I got a feeling when we tick the first upper box that say commit to non protected branch bla bla is what cause it ...but im not sure..just a wild guess. i mean for the branch setting

ayurahman commented 8 months ago

the box that say require a pull request before merging...on the section protecting matching branch...just my assumption that is the one that cause the hook thing

ayurahman commented 8 months ago

Any suggestions? Force pushes are blocked but pull requests are allowed so I don't see why it won't let you. Maybe commit and then pull request rather than pushing and it will merge the changes?

yup already tried that just now. my push still got rejected. I think the only choice now is to untick the box that say 'require a pull request before merging'...'on the section protecting matching branches'..I think that is the only thing I can suggest right now

gl186 commented 8 months ago

problem rectified by amending branch rules during team meeting with @LMP2005 @SonjaR-UniMan @Lindaalnsour

gl186 commented 8 months ago

you will be able to push onto all branches but main now which remains protected. issue completed but not closed to remain open for assessment purposes.

ayurahman commented 8 months ago

Glad you guys managed to sort that out. Thank you so much. I have able to push to Team-4 branch now. I will close this issue now.

ayurahman commented 8 months ago

Thanks again.

ayurahman commented 8 months ago

Thanks