On Tue, Feb 21, 2012 at 3:03 AM, Andy Allan <[email protected]> wrote: > 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)!
Ok, fair enough. What's the difference between that command line and just "git fetch systemed; git checkout systemed/master; git checkout -b something-new"? Also, I imagine there must be a way to recover, if I forget to do this, and make changes that build on other (unrelated) changes. Something like "git fetch systemed; git rebase systemed/master"? (but not quite like that) Steve _______________________________________________ Potlatch-dev mailing list [email protected] http://lists.openstreetmap.org/listinfo/potlatch-dev
