> In addition to Alan's suggestion, another approach would be to setup a >local > bare git repo that all your local machines could push/pull to/from.
I tried this. As soon as I rebase a branch I am no longer able to push it to the local bare repo because all the changes made since the last push no longer exist and are replaced with new ones with different guids. > Out of curiosity, how did you handle this situation when using Subversion? I didn't. I wasn't so involved when we were using svn, so firstly I only really worked on my Windows machine and secondly if I needed to work on something and stash it away I literally copied it to another folder. >The git format-patch and git am method has recently worked well to >share experimental development work from one of your computers to >mine. This has the same downsides. As soon as I rebase a branch all patched repos which included the rebased commits get screwed up, because the commits they included from the patch no longer exist. I realised that basically this means that as soon as I rebase a branch it must be purged from all my repos on all my machines. This isn't really ideal and sometimes things slip through. I think I'm getting the hang of it more as time goes on, but life would be easier if I didn't have to get the hang of it. It's just a comment into the debate about merge vs rebase workflow, I'm certainly not demanding we change, just wanted to make people aware of the restriction, see if anyone had any better suggestions and make sure this is considered if we do ever have a debate about changing. Phil ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=190641631&iu=/4140/ostg.clktrk _______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel
