Re: Help trying to merge my changes to current default

[Juan Pablo Carbajal]

> It's hard to say for sure without seeing exactly what you've done.
>
> You might be able to simply rebase your changes to the head of the branch
> that you are working on.  Then if you want to smash them all into a single
> commit (or just a few instead of many) you can also use histedit to do that.
>
> jwe

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?

outgoing.log
Description: Text Data