2 ms·
Forgive my dumb question, how do you avoid rebase (ex: when making PR)?
by nerdyadventurer 3y ago
Forgive my dumb question, how do you avoid rebase (ex: when making PR)?
- Supermancho 3y agoGenerally you merge main into your branch to resolve the conflicts there, then push to make the PR. Sometimes it's easier to rebase, sometimes easier to merge your main. The frequency of one or the other being more useful/easier often influences the accepted workflow.