[Vm-dev] [OpenSmalltalk/opensmalltalk-vm] FileAttributesPlugin: Add session Id (f6445ab)

[Nicolas Cellier]

Note that I like to see the "messy" decomposed history where each change
has a rationale attached in a separate commit message.
Of course, erratic trial and errors may benefit from a little rewrite of
history, but not a squash, it's too violent for my taste, more something
like a rebase -i.

When perigrinations are too much random, I prefer a fulll rewrite on a
brand new branch with cherry-picking.


Le jeu. 27 déc. 2018 à 16:09, akgrant <notifications at github.com> a écrit :

>  Hi Ben,
>
> On Mon, 17 Dec 2018 at 15:55, Ben Coman <notifications at github.com> wrote:
> >
> > To provide cleaner PRs, I tend to "git commit --amend" to my-branch that
> I
> > issued a PR from and force push that to my github account.
> > In spite of the general advice not to force push public branches, in
> > reality it seems people rarely branch except from the canonical account.
> > Actually this could be covered by a convention like...
> > "if you branch from someone's personal account, immediately push it to
> > your account so it shows up in the network view."
> > Forcing pushing only a problem if someone has branched from it the
> network
> > view could be checked before forcing pushing.
>
> Just as an alternative:
>
> Instead of amending the commits, sometimes I double branch and squash
> the merges back, e.g. (from memory):
>
> $ git checkout Cog
> $ git checkout -b IssueBranch
> $ git checkout -b IssueBranchDev
>
> Lots of little commits, backtracks, etc. while solving the problem.
>
> $ git checkout IssueBranch
> $ git merge --squash IssueBranchDev
> $ git push
>
> and then create the PR.
>
> The advantage is that I still have the messy history available in
> IssueBranchDev while I'm doing the development.
>
> Cheers,
> Alistair
>
> —
> You are receiving this because you are subscribed to this thread.
> Reply to this email directly, view it on GitHub
> <https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f6445ab9ea75f685e4e53bff8917449646c3754b#commitcomment-31789305>,
> or mute the thread
> <https://github.com/notifications/unsubscribe-auth/AhLyW40hCYbg0EQqyhHWytu6-7WlDtxIks5u9OKRgaJpZM4ZVgm6>
> .
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.squeakfoundation.org/pipermail/vm-dev/attachments/20181227/93cfbfcb/attachment-0001.html>