Indeed Thomas, good point, pulling modifs from the branch you started your branch from, because the original author of the source branch updated it somewhat, will remove needs to 'fix merge conflicts' if any later on.
On Friday, July 24, 2020 at 8:09:58 AM UTC-4, Thomas Passin wrote: > > > On Friday, July 24, 2020 at 8:00:16 AM UTC-4, Edward K. Ream wrote: >> >> >> >> *Base all feature branches on dev* >> >> Previously, I based my feature branches on an "ekr" branch. But this >> complicates everything. Far better to base all feature branches on dev (or >> devel in Leo). >> > > And remember to update your branch to its parent before creating the PR. > You don't want to be accidentally including recent parent's changes into > your PR. > > -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/leo-editor/a4b351af-ba46-4c05-a898-6fd2fe2d55eco%40googlegroups.com.
