Re: Help trying to merge my changes to current default

[John W. Eaton]

On 03/20/2018 11:19 AM, Juan Pablo Carbajal wrote:
> > It's hard to say for sure without seeing exactly what you've done.

> Ok, attached is my messy committing: a) I mention a local bookmark
> (refactor_pkg), b) I mention upstream, c) there are many local merges
> (the repo was moving quite fast in octconf)
> I think this adds too much noise tot he log, so I was trying to find
> out the best way to do it.
> Since rebase is an extension (I am not confident), I might go for the
> re-cloning. Is there an objection to that?

I use rebase often.  If you are really worried that it will fail, work 
on a separate clone where it won't matter if you make some mistakes.

Another useful extension is "glog" for displaying a graphical 
representation of parent commits so you can see more clearly the 
relationship of changesets, similar to the display here:

http://hg.savannah.gnu.org/hgweb/octave/graph/4f1da669b610

jwe