@sp35 @theBstar I did my work on the mainbranch and then I realized that the work is to be pushed to the feedbackbranch. In order to do so, I merged the mainbranch into my feedbackbranch and then removed changes from the mainbranch using a hard reset. But, I didn't notice that the PR by GitHub classroom got merged automatically. I didn't understand why the PR got merged because I was doing something different which is merging maininto feedbackand not merging feedbackinto main.
I have made another PR from my feedback branch now. Does that work ?
#6 I think this can help u, basically they say if you push in feedback branch, it doesn't matter, the important thing is that your code is in the main branch
@sp35 @theBstar I did my work on the
main
branch and then I realized that the work is to be pushed to thefeedback
branch. In order to do so, I merged themain
branch into myfeedback
branch and then removed changes from themain
branch using a hard reset. But, I didn't notice that the PR by GitHub classroom got merged automatically. I didn't understand why the PR got merged because I was doing something different which is mergingmain
intofeedback
and not mergingfeedback
intomain
. I have made another PR from my feedback branch now. Does that work ?