ReviewBoard is now the official review tool for juju
Menno Smits
menno.smits at canonical.com
Tue Sep 16 03:26:55 UTC 2014
On 16 September 2014 08:39, Ian Booth <ian.booth at canonical.com> wrote:
>
>
> On 16/09/14 00:50, Eric Snow wrote:
>
>
> > Step (0) is also pretty easy and I'll argue that people should be
> > doing it anyway.
> >
>
> Disagree :-)
> I never (or very, very rarely) had to do this with Launchpad and bzr and
> things
> Just Worked. I don't do it now with github and pull requests. I'd like to
> think
> we'd be able to avoid the burden moving forward also.
>
Sorry, I didn't mean for this to turn into a rebase vs merge discussion. A
different choice of wording would have helped. The first step could have
been written like:
0. Sync up your feature branch with upstream (by merging or rebasing)
Some people like rebasing and some like merging. It doesn't matter much to
the rest of the team which approach you use but I presume that everyone
syncs up their branch somehow soon before proposing (rerunning tests etc)
to ensure that other people's changes haven't impacted theirs.
- Menno
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/juju-dev/attachments/20140916/fece574b/attachment.html>
More information about the Juju-dev
mailing list