On Saturday, July 25, 2020 at 10:32:23 AM UTC-5, Edward K. Ream wrote:
> I just made another mistake. I merged the keys branch into devel without
a PR. That's too bad. The PR would have summarized all the changed.
I used gitk to guess at the first relevant commit.
Here is a Leo script that sho
On Friday, July 24, 2020 at 7:00:16 AM UTC-5, Edward K. Ream wrote:
> [Here is a summary of newbie mistakes with PRs]
I just made another mistake. I merged the keys branch into devel without a
PR. That's too bad. The PR would have summarized all the changed.
gitk shows branch info, so all is no
On Fri, Jul 24, 2020 at 9:00 AM Félix wrote:
> 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.
>
Good to know. Thanks.
On Fri, Jul 24, 2020 at 7:10 AM Thomas Passin wrote:
> 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.
Exactly. Happily, now that I know where to find the diffs *before* creating
the PR, I
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
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 t
For the last few days I have been struggling with making good PR's for
Félix's leoInteg project. Now I see the newbie mistakes I made, and how to
correct them. Here's a summary:
*Seeing diffs before creating the PR*
I use large fonts, so at first I didn't see that when I click the "New PR"
but
