Re: Triangular workflows and some anecdotes from the trenches

2016-04-06 Thread Junio C Hamano
Chris Packham writes: > On Wed, Apr 6, 2016 at 10:24 AM, Junio C Hamano wrote: > >> Developer ending up amending is not an issue per-se, unless the >> result is pushed back to the public. > > Correct and that was when the developer in question realised he had a problem. But then "push" would ha

Re: Triangular workflows and some anecdotes from the trenches

2016-04-06 Thread Chris Packham
On Wed, Apr 6, 2016 at 10:24 AM, Junio C Hamano wrote: > Chris Packham writes: > >> We ran into something at $dayjob the other day. The actual problem was >> a developer ended up amending a commit that had already been pushed. >> It happens occasionally and is usually recoverable with a simple >>

Re: Triangular workflows and some anecdotes from the trenches

2016-04-05 Thread Junio C Hamano
Chris Packham writes: > We ran into something at $dayjob the other day. The actual problem was > a developer ended up amending a commit that had already been pushed. > It happens occasionally and is usually recoverable with a simple > rebase and is generally a learning experience. In this particu

Triangular workflows and some anecdotes from the trenches

2016-04-05 Thread Chris Packham
Hi, We ran into something at $dayjob the other day. The actual problem was a developer ended up amending a commit that had already been pushed. It happens occasionally and is usually recoverable with a simple rebase and is generally a learning experience. In this particular case however things wer