search

nus-cs2113-AY2324S1 / forum

0 stars 0 forks source link

Accidentally Fast forward merge branch level 6 #20

Open wwweert123 opened 1 year ago

wwweert123 commented 1 year ago

Just now, I was following the instructions for iP and i created a branch for both level 6 and level 7 and completed the activities for them. Then I merged branch level 6 to master. I only realized that I have merged branch level 6 with fast forward only after I have merged branch level 7 to master and solved all the merge conflicts. Will this be a problem?

okkhoy commented 1 year ago

We will check for a merge without fast-forward here. So that particular entry will be red on your iP dashboard. This can be fixed, pls ping me after the lecture; I will be able to help

wwweert123 commented 1 year ago

Thanks prof! Do you mean you find you after the lecture on Friday?

okkhoy commented 1 year ago

yup.

wwweert123 commented 1 year ago

Hi Prof, it seems that the script did detect my branch-Level-6 merge with fast forward for some reason and my iP dashboard is now green for that entry. I think alls good now. Thanks prof!