Re: Current git workflow

2012-03-21 Thread André Pönitz
On Wed, Mar 21, 2012 at 05:04:56PM +0100, Pavel Sanda wrote: > Georg Baum wrote: > > commit yet)? I guess it would look like > > > > git checkout -b fixfileformat > > git commit > > git checkout master > > git merge fixfileformat > > git commit > > git branch -d fixfileformat > > The simplistic S

Re: Current git workflow

2012-03-21 Thread Pavel Sanda
Georg Baum wrote: > commit yet)? I guess it would look like > > git checkout -b fixfileformat > git commit > git checkout master > git merge fixfileformat > git commit > git branch -d fixfileformat The simplistic SVN-like scenario is just: git pull (update from public repo) git commit (just loca

Re: Current git workflow

2012-03-20 Thread Richard Heck
On 03/20/2012 04:14 PM, Georg Baum wrote: I have to admit that I am confused. There have been lots of discussions and proposals, but to me it is neither clear whether a long term workflow has been agreed on, nor how the current workflow is supposed to look like. For example, what am I supposed to

Current git workflow

2012-03-20 Thread Georg Baum
I have to admit that I am confused. There have been lots of discussions and proposals, but to me it is neither clear whether a long term workflow has been agreed on, nor how the current workflow is supposed to look like. For example, what am I supposed to do if I want to fix the latest file form