I've yet to use git+svn, so i'm not sure what git svn rebase does but for the others I use: 1) git checkout -b <branch> 2) git commit 3) git checkout trunk 4) git pull 5) git merge <branch> 6) -
On Tue, Dec 15, 2009 at 10:03 PM, Howard Lewis Ship <[email protected]> wrote: > Took a couple of extra passes but I worked it out. > > I probably did something wrong along the way. > > I'm not 100% sure I followed the right procedure. Do you use "git > pull" or "git svn rebase" to pull latest changes into your local trunk > branch? Perhaps we could review the whole process: > > 1) Create a local branch > 2) Series of local commits > 3) Switch to trunk > 4) Catch up with trunk changes > 5) Apply local branch changes to trunk > 6) Commit to SVN > > I'd like to verify what the right Git command is for each of those > steps. Thanks! > > On Tue, Dec 15, 2009 at 10:00 AM, Howard Lewis Ship <[email protected]> wrote: >> Hm. Maybe it did work. Hopefully I haven't screwed anything up. >> >> >> On Tue, Dec 15, 2009 at 9:52 AM, Howard Lewis Ship <[email protected]> wrote: >>> ... if you're wondering about my latest commits, it's because >>> something with my dcommit worked poorly. >>> >>> I'm working to fix it. >>> >>> >>> -- >>> Howard M. Lewis Ship >>> >>> Creator of Apache Tapestry >>> >>> The source for Tapestry training, mentoring and support. Contact me to >>> learn how I can get you up and productive in Tapestry fast! >>> >>> (971) 678-5210 >>> http://howardlewisship.com >>> >> >> >> >> -- >> Howard M. Lewis Ship >> >> Creator of Apache Tapestry >> >> The source for Tapestry training, mentoring and support. Contact me to >> learn how I can get you up and productive in Tapestry fast! >> >> (971) 678-5210 >> http://howardlewisship.com >> > > > > -- > Howard M. Lewis Ship > > Creator of Apache Tapestry > > The source for Tapestry training, mentoring and support. Contact me to > learn how I can get you up and productive in Tapestry fast! > > (971) 678-5210 > http://howardlewisship.com > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > > -- Andreas Andreou - [email protected] - http://blog.andyhot.gr Tapestry / Tacos developer Open Source / JEE Consulting --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
