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

[gits] Branch Help

> Thanks Gary and Rob! Why not rename the existing branch to old-aptui and 
> rename temp-aptui to just plain apt? We can throw away the old branch 
> after a suitable amount of time (long enough to forget all about it). 
> Then I can (attempt) to do what I wanted to in the first place, which is 
> merge in Keith's latest. 

I went ahead and did this ... Keith's changes are also merged in and pushed
up. git push -u is very handy for this.

I will note that when I tried to merge in Keith's branch I got a ton of
conflicts, all in unrelated files. Since all of Keith's changes were in a
single commit at HEAD of his branch, I just cherry picked that commit into
my new apt branch and pushed it up.