nus-cs2113-AY2425S1/forum

Rebasing when syncing personal forks for tP

Closed this issue · 6 comments

xenthm commented

Appendix E: Using GitHub instructs us to avoid rebasing when when merging PRs.

Can we do that when managing our own fork instead? The goal is to keep our fork commit history cleaner.

okkhoy commented

Would it not affect the branches you create further and create PRs from? I don't have personal experience doing this (rebase fork vs not the upstream), so I can't give a definitive answer 🙁

xenthm commented

Would it not affect the branches you create further and create PRs from?

Yes, my understanding is that it will reduce the clutter on my fork as a result of merge commits from other PRs from upstream.

That being said, I think that that will cause issues when I create my own PRs since my fork's commit history will be different from the upstream's.

okkhoy commented

I think that that will cause issues when I create my own PRs since my fork's commit history will be different from the upstream's.

this is what I was alluding to, and I don't have personal experience doing this.

xenthm commented

Alright, I will stick with merging then.

avoid rebasing when when merging PRs

As for this, am I right to say that the motivation is to ensure that the automated checks for tP progress work as intended?

okkhoy commented

Yes, that is correct, as stated in the site.

xenthm commented

Thank you Prof!