[petsc-dev] PETSc developers who use weird MPI
Satish Balay
balay at mcs.anl.gov
Fri Nov 1 21:52:20 CDT 2013
On Fri, 1 Nov 2013, Satish Balay wrote:
> No I did not. If you look at gitk - my commits are on to of your
>
> 53deab39b05c95f82ded0f9b5ed98e1eca77ec57
>
> But somehow it got cherrypicked over master commit as
> a49f225f21e5e022456a96fbd0a3a873045b2c5d and then remerged into
> prbrune/sf-sfbasicops'?
>
> $ git branch -r --contains a49f225f21e5e022456a96fbd0a3a873045b2c5d
> origin/prbrune/mat-matcolor
> origin/prbrune/sf-sfbasicops
>
> 'git reflog' might have some relavent info
>
> Since this cherrypicked/rebased commit is not needed
> force update prbrune/sf-sfbasicops to the previous state at
> f3fe83a48b02c7fae642249467649629cca6fe7e?
>
> [assuming its not yet merged into other branches]
>
I should read what I copy/paste better :(
Looks like a49f225f21e5e022456a96fbd0a3a873045b2c5d is already
merged into origin/prbrune/mat-matcolor
So perhpas both branches need forceupdate to a cleaner state.. [before
Barry merged into 'barry/saws]
Satish
More information about the petsc-dev
mailing list