xylucien / MusicalKits_Converter

My personal Flask project
1 stars 0 forks source link

Use child-branch and pull request #3

Closed xicheng87 closed 4 years ago

xicheng87 commented 4 years ago

Let's use child-branch and pull request to manage mergeup and code reivew, as this is a standard industry practice, and can prevent your master branch from errors.

To create a child branch, do

git checkout -b {branch-name}

Then in that branch commit your code by

git commit -m {commit message}

When you push your changes to remote branch, do

git push origin {branch-name}

This way, temporary changes are in child branch.

Once you are done with the child branch changes, create a pull request so that we can review the changes and improve things. This way, I and you don't have to look back the commit histories for checking things.

xicheng87 commented 4 years ago

Reopen this issue until the first pull request gets made from a child branch.

xylucien commented 4 years ago

done

xicheng87 commented 4 years ago

Child branch created, and pull request pending.

xicheng87 commented 4 years ago

I reviewed this issue again, and I am not sure what you meant by "done". I don't quite see how the child branch is updated, and I don't see a pull request. You need to commit and push your changes to the child branch first, and once they are passing and in good shape, you create a pull request from the child branch, then we review it and then merge up. That is a standard workflow.

xylucien commented 4 years ago

I was switching to master branch and merge from child... That is quite not the right way to do it, I just realized.

xylucien commented 4 years ago

Just created a pull request.

xicheng87 commented 4 years ago

Please do not merge a pull request pre-maturely before it got reviewed. Otherwise it is almost meaningless to have to this code review process. I need to spend more time to go through the impl as I think there needs punishment.

You can always keep submitting to a child branch while it is getting reviewed, and that will be reflected in the pull request anyway.

xicheng87 commented 4 years ago

Furthermore, you can ping me at wechat if I get slow on reviewing your pull request, and at some point I will also send you a pull request.