[petsc-dev] strangness in Chebyshev estimate of eigenvalues

[Mark Adams]

OK, so you just trust that working in next is proof that it will work in
master and just 'git merge branch' in master without ever doing a  'git
merge master' in branch.

Do I now wait for my pull request to be approved?

On Tue, May 24, 2016 at 12:12 AM, Jed Brown <jed at jedbrown.org> wrote:

> Mark Adams <mfadams at lbl.gov> writes:
> > I am merging master more than I need to, just to be up to date.  I guess
> it
> > pollutes the history with all these merges.  And I should squash them...
>
> You shouldn't merge from 'master' unless you need something specific,
> and in that case, write a commit message explaining what it is that you
> need.  You can rebase at will (before publishing your branch), but it's
> generally fine to just work in your branch and ignore what is happening
> in other branches.
>
> The rationale is explained in detail at the links in this section.
>
>
> https://bitbucket.org/petsc/petsc/wiki/developer-instructions-git#markdown-header-merging
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20160524/8c6f51ca/attachment.html>