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

[akgrant]

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 or view it on GitHub:
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f6445ab9ea75f685e4e53bff8917449646c3754b#commitcomment-31789305
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.squeakfoundation.org/pipermail/vm-dev/attachments/20181227/f2c5e360/attachment-0001.html>