Re: not rebasing after PR?

2014-06-05 Thread John Weldon
On Thu, Jun 5, 2014 at 8:22 AM, Nate Finch nate.fi...@canonical.com wrote: commit several times to your feature branch. rebase into a single commit I don't see any problem with rebasing commits that you've already pushed to your github personal fork, but that *could* be considered changing

Re: not rebasing after PR?

2014-06-05 Thread Gustavo Niemeyer
FWIW, I pretty much never rebase in my usual development workflow. I'm surprised to hear it became a norm somehow. On Thu, Jun 5, 2014 at 2:06 PM, roger peppe rogpe...@gmail.com wrote: I'd love to ditch rebasing if it was reasonable to do so. It just adds overhead to an already tiresome

Re: not rebasing after PR?

2014-06-05 Thread Andrew Wilkins
On Fri, Jun 6, 2014 at 1:22 AM, Casey Marshall casey.marsh...@canonical.com wrote: On 06/05/2014 10:22 AM, Nate Finch wrote: This mashes all your pre-PR commits into one, so hides some commit spam that way, but then keeps the post-PR commits, to preserve comments. It sounds like we can

Re: not rebasing after PR?

2014-06-05 Thread Tim Penhey
On 06/06/14 11:52, Andrew Wilkins wrote: On Fri, Jun 6, 2014 at 1:22 AM, Casey Marshall casey.marsh...@canonical.com mailto:casey.marsh...@canonical.com wrote: On 06/05/2014 10:22 AM, Nate Finch wrote: This mashes all your pre-PR commits into one, so hides some commit spam