DEV Community

Discussion on: A cleaner Github workflow: one commit per Pull Pequest

amalv profile image
amalv Author

Thanks for the clarification rhymes, that's good to know. I will try this approach in my next public repository project, it seems that in both cases there is only one commit in the end but may be using "squash and merge" you can avoid the manual rebase step if there are no conflicts.

Thread Thread
rhymes profile image

Yeah that's it. We only rebase if we need to bring in changes from master or if there's a conflict, but conflicts can be solved merging without rebasing as the final commit will be squashed anyway