HousewareHQ / frontend-engineering-octernship

45 stars 55 forks source link

Which branch should the changes be done? #6

Closed naveen521kk closed 1 year ago

naveen521kk commented 1 year ago

Hello 👋, I'm slightly confused about which branch I should be working on.

Students are expected to use the GitHub Flow when working on their project.

  1. Making changes on the auto generated feedback branch to complete the task.
  2. Using the auto generated Feedback Pull Request for review and submission
  3. Using GitHub Discussions to ask any relevant questions regarding the project

These instructions (from the README) in my understanding tell that I should be working on the feedback branch. The confusion I got when looking at the auto-generated "Feedback Pull Request" is that the bot created it to merge into feedback the changes from main, main -> feedback, this is as if I should be working on the main branch and it'll be merged into the feedback branch on review. This is the other way around, actually.

firefox_KaqDnPZuIE

I started committing to the feedback branch following the instruction but looks like PR didn't update from that. I'm confused about this and would like some assistance on what I should do here. Thanks!

cc @ashwinexe since you made the changes in Readme

rahulaarora commented 1 year ago

Hi @naveen521kk, I also have the same confusion, I started committing on the Main branch.

SamChus commented 1 year ago

Please I really need assistance on this too.

shubh24 commented 1 year ago

Sure, let us get back here!

krcpr007 commented 1 year ago

Hii @shubh24 I have the same confusion and also want to know where we do write a readme & a PR description on how to run the project locally.

CyberGA commented 1 year ago

Hi, after registration, a repository is automatically generated for you. Check your list of repo, you should see it, then I think the changes should be pushed to the feedback repo.

krcpr007 commented 1 year ago

@CyberGA so what do we have to do? Just push to the generated repo or which branch we have to push main or feedback?

CyberGA commented 1 year ago

@CyberGA so what do we have to do? Just push to the generated repo or which branch we have to push main or feedback?

@krcpr007 according to the instruction, what I did is, I cloned the repo generated for me, then I created another branch and built the solution in there and then push that branch to github. Then I made a pull request from that branch into the auto generated feedback branch

krcpr007 commented 1 year ago

@CyberGA I have pushed my code to the generated repo main branch and I can see the changes as below is it perfect? image

CyberGA commented 1 year ago

@CyberGA I have pushed my code to the generated repo main branch and I can see the changes as below is it perfect? image

Yes. Then you can update the README file that is in the app directory with what is required

krcpr007 commented 1 year ago

@CyberGA I have pushed my code to the generated repo main branch and I can see the changes as below is it perfect? image

Yes. Then you can update the README file that is in the app directory with what is required

Do you mean a PR description on how to run the project locally? Anything else can you add I should write in Readme.md

CyberGA commented 1 year ago

@CyberGA I have pushed my code to the generated repo main branch and I can see the changes as below is it perfect? image

Yes. Then you can update the README file that is in the app directory with what is required

Do you mean a PR description on how to run the project locally? Anything else can you add I should write in Readme.md

Yes since a README and a PR description was stated

naveen521kk commented 1 year ago

So, where exactly I should push my changes, main or feedback or to another branch? I've already pushed some commits to feedback branch, should I rewrite the history there (that is make it so that it's how it was originally?)?

CyberGA commented 1 year ago

So, where exactly I should push my changes, main or feedback or to another branch? I've already pushed some commits to feedback branch, should I rewrite the history there (that is make it so that it's how it was originally?)?

You can write your solution on the feedback branch and push or make a pull request to the feedback bracnh

Kdsingh333 commented 1 year ago

I have a one doubt regarding houseware---backend project , is there any restriction using Golang Framework , Orm and database or we can use any framework in this project @shubh24 ??

shubh24 commented 1 year ago

I have a one doubt regarding houseware---backend project , is there any restriction using Golang Framework , Orm and database or we can use any framework in this project @shubh24 ??

Please raise this issue in the relevant repository.

shubh24 commented 1 year ago

Hey all, thanks for your patience here!

As has been mentioned above in the thread, we'd suggest the following for submission:

Updating the above instructions in the Readme as well. Feel free to ask any further questions on this Issue.

manaver commented 1 year ago

@shubh24 i pushed my code into feedback branch (not on main) and pr automatically merged? Is there anything that i need to correct?

shubh24 commented 1 year ago

@shubh24 i pushed my code into feedback branch (not on main) and pr automatically merged? Is there anything that i need to correct?

No need to worry -- the reviewers will check on your repository.

manaver commented 1 year ago

Thanks sir

Ravikisha commented 1 year ago

how to submit my code to the reviewer?

naveen521kk commented 1 year ago

Thank you for the detailed answer @shubh24! I'll close the issue then.

AbhishekBhamare commented 1 year ago

@shubh24 Should we merge the PR or Reviewer will do it?

Fikunmi01 commented 1 year ago

@shubh24! I pushed my code to a new branch I created, can I do that please ?