On Wed, May 25, 2016 at 10:18 AM, Satish Balay <ba...@mcs.anl.gov> wrote:
> On Wed, 25 May 2016, Mark Adams wrote:
>
> >
> > 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?
>
> 1. Verify that its feature complete as you expect [and not missing any
> commits]?
>
> gitk master..mark/snes-ex56c
>
I got this error:
10:37 mark/snes-ex56c= ~/Codes/petsc/src/snes/examples/tutorials$ gitk
master..mark/snes-ex56c
Error in startup script: unknown color name "lime"
(processing "-fore" option)
invoked from within
"$ctext tag conf m2 -fore [lindex $mergecolors 2]"
(procedure "makewindow" line 347)
invoked from within
"makewindow"
(file "/Users/markadams/homebrew/bin/gitk" line 12434)
>
> 2. Update branch as needed [perhaps you were wanting to squash
> commits? since you've mentioned 'rebase -i' previously?]
>
>
git rebase -i
or
git rebase -i master
?
> 3. verify and test locally?
>
> 4. update 'mark/snes-ex56c' on server.
>
> git push -f
>
> 5. If feature complete - update pull request?
>
> Satish
>
