search

HousewareHQ / frontend-engineering-octernship

45 stars 55 forks source link

revert? #18

Closed JasonDsouza212 closed 1 year ago

JasonDsouza212 commented 1 year ago

Without knowing, I pushed my initial code directly to the feedback repository. Is it okay or should I revert it?

Sindhuinti commented 1 year ago

At first they mention to push our code to Feedback branch. By doing this feedback PR is merged by the bot I too have the same issue

JasonDsouza212 commented 1 year ago

As developers, it would be helpful to receive replies from the community so that we can work to solve problems.

narayan954 commented 1 year ago

At first they mention to push our code to Feedback branch. By doing this feedback PR is merged by the bot I too have the same issue

I have done the same :(

naveen521kk commented 1 year ago

Without knowing, I pushed my initial code directly to the feedback repository. Is it okay or should I revert it?

I ended up rebasing the feedback so that it doesn't close the PR and cherry-picked my commits there and pushed it into the main branch.

CyberGA commented 1 year ago

Without knowing, I pushed my initial code directly to the feedback repository. Is it okay or should I revert it?

I ended up rebasing the feedback so that it doesn't close the PR and cherry-picked my commits there and pushed it into the main branch.

did this work?

naveen521kk commented 1 year ago

did this work?

Yeah it did.

JasonDsouza212 commented 1 year ago

however we needed to push our code to our main branch so I did that

babboe1 commented 1 year ago

since we were told to push all our code to the main branch, I merged the feedback branch to the main branch and continued working on the main branch, I made some changes in the main branch and decide to sync it to the feedback branch, so from my vscode I decided to merge the main branch into the feedback branch using git commant "git merge main" , coming to Github I realized that the auto feedback PR had also been merged and added as a part of my commit, rebasing didn't solve the issue for me , as the PR was never reopened , I reverted the feedback branch to a state before the sync, the PR remained merged and closed Any tips,