[petsc-dev] strangness in Chebyshev estimate of eigenvalues

[Mark Adams]

On Wed, May 25, 2016 at 9:44 AM, Satish Balay <balay at mcs.anl.gov> wrote:

> On Wed, 25 May 2016, Mark Adams wrote:
>
> > I did 'git rebase -i master', in jed's branch and need to fix about 1/2
> > dozen failures to apply patch.  I fixed them, but this does not seem like
> > what I should be doing.  I also had many commits that were not mine, I
> > guess because I pulled from master.  I squashed about 8 of mine and kept
> 2
> > of them.  I pushed this all back to master in jed/mark/snes-ex56c.
>
> Jed had already rebaed - and 'jed/mark/snes-ex56c' already had all
> your commits.


Yes, and was squashing them with git rebase -i master


> So your attempt to rebase 'jed/mark/snes-ex56c' over
> 'mark/snes-ex56c' (or merge?)  doesn't make sense wrt workflow.
>
> > two errors here: 1) don't pull from master, 2) pull from Matt's branch
> and
> > not next. (1) is new to me, and (2) was being sloppy, admittedly.
>
Also - you are modifying default 'commit message' in merge commits. I see
> you've done this again in your push to jed/mark/snes-ex56c
>
>
(3) do not change default merge commit message


> >>>>>>>>
> commit e4e9dc53ef29cde6db6677596a30c1552e9bc234
> Merge: 5a3406a f2cb842
> Author: Mark Adams <cal2princeton at yahoo.com>
> Date:   Wed May 25 09:05:23 2016 -0700
>
>     merge after pull
> <<<<<<<
>
> As mentioned before - please do the following [assumig you want to
> continue your work on mark/snes-ex56c]
>
> git checkout mark/snes-ex56c
> git reset --hard f2cb8422898d35ef96e146caa3a95b2f879b25f1
> [I'm explicitly listing commit-id here - since the brach
> jed/mark/snes-ex56c is changed]
>

10:09 mark/snes-ex56c= ~/Codes/petsc/src/snes/examples/tutorials$ git reset
--hard f2cb8422898d35ef96e146caa3a95b2f879b25f1
HEAD is now at f2cb842 fixed bug in makefile

OK, now what?


>
> or I can do this - and you can delete/recreate mark/snes-ex56c
>
> Satish
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20160525/52e48072/attachment.html>