[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Help trying to merge my changes to current default

From: John W. Eaton
Subject: Re: Help trying to merge my changes to current default
Date: Tue, 20 Mar 2018 11:44:32 -0400
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0

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:



reply via email to

[Prev in Thread] Current Thread [Next in Thread]