[Potlatch-dev] Github, and tram/road issues

[Andy Allan]

On 19 February 2012 02:36, Steve Bennett <stevagewp at gmail.com> wrote:
> Ok, it looks like I'm still doing something wrong:
>
> https://github.com/systemed/potlatch2/pull/25
>
> I only wanted to include one commit in the pull request, not 9. Is the
> idea that I keep rewinding my local repository back to the current
> master before making any change? Or is there some trick with rebase,
> to avoid this situation?

Well, making feature branches starting from richardf's latest master
is a reasonable approach. The problem with that pull request is that
the commit you want ( ac1d25 ) doesn't have anything from richard's
repo as the parent - it has f2e94bc7 as a parent, which has its own
parent etc. Richard can't add ac1d25 without those parents - in git, a
commit's parents are part of the commit and are even encoded into the
commit id.

So yeah, best thing to do is to have feature branches based on a
reasonably recent commit from Richard's repo, and pull request these
branches. To make your life easier I can recommend keeping your
"master" branch as an exact mirror of Richard's, start the day with a
quick "git fetch systemed; git checkout master; git merge --ff-only
systemed/master; git checkout -b something-new". Well, that's more or
less how I work, and it works for me (tm)!

Cheers,
Andy