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

[gits] Branch Help

On Jan 8, 2014, at 11:56 AM, Eric Eide <eeide at cs.utah.edu> wrote:

> Depending on your goal, you might consider whether a merge would be more
> appropriate.  In this case, I'm guessing that you would want to merge master
> into aptui, to bring the aptui branch up to date with respect to mainline
> changes (while keeping the aptui-specific changes out of master).

Agreed, this is the right way to go.