[petsc-dev] developing on top of an outstanding pull request

[Jed Brown]

"Mark F. Adams" <mfadams at lbl.gov> writes:

> I seemed to have messed up in trying to build on top of an outstanding
> pull request.  My branch does not have older material that I thought
> had been merged in.  I noticed that master is more up to date than the
> branch I'm working on.

Independent unmerged branches can be rebased onto current 'master'.

> So how should I create a branch to build on a merge of master with
> madams/mat-residual?

Don't build on 'madams/mat-residual' yet because it has lots of problems
and will have to be amended.

https://bitbucket.org/petsc/petsc/commits/9a2d9e0fedfb901d754ddc9925e94c915f942072
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20130917/6c33f5f2/attachment.sig>