[petsc-dev] [Bitbucket] Pull request #109: Added at test, simplified version of ex11, convergence test. Uses differencing to produce matrix in stand alone code, fixed SNES to support this. (petsc/petsc)

[Mark F. Adams]

> 
> $ git checkout -b madams/sr-driver3 knepley/feature-plex-refine-3d
> $ git merge knepley/fix-plex-ghost-cells
> $ git cherry-pick  [sha1 for "start of segmental refinement"]

I did:

  575  git checkout -b madams/sr-driver4 origin/knepley/feature-plex-refine-3d
  576  git merge knepley/fix-plex-ghost-cells
  577  git merge origin/knepley/fix-plex-ghost-cells
  578  git cherry-pick  08d4e56

13:36 madams/sr-driver4 ~/Codes/petsc$ git cherry-pick  08d4e56
error: could not apply 08d4e56... start of driver for segmetal refimenent.
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
13:37 1 madams/sr-driver4|CHERRY-PICKING ~/Codes/petsc$ git status
# On branch madams/sr-driver4
# Your branch is ahead of 'origin/knepley/feature-plex-refine-3d' by 152 commits.
#   (use "git push" to publish your local commits)
#
# You are currently cherry-picking.
#   (fix conflicts and run "git cherry-pick --continue")
#   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
#
# Unmerged paths:
#   (use "git add <file>..." to mark resolution)
#
#       both added:         src/ts/examples/tutorials/ex31.c
#       both modified:      src/ts/examples/tutorials/makefile
#
# Untracked files: