[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gits] Branch Help
- Subject: [gits] Branch Help
- From: lbstoller at gmail.com (Leigh Stoller)
- Date: Wed, 8 Jan 2014 16:16:37 -0800
- In-reply-to: <BFF2BE5C-ED6B-4AE7-8FF7-EE874062552E@gmail.com>
- References: <F70BD659-2F93-4DFE-A26E-9980E58DFE60@cs.utah.edu> <736AB70E-FD84-486C-822D-8B503D8AEAE9@gmail.com> <D73DC791-0869-49EC-8C62-2BC4C6E3CF25@gmail.com> <50DA84BA-47EB-4586-B42B-D9F6D1B063BA@cs.utah.edu> <64A0B513-A660-4320-898F-C1C6766DD34A@gmail.com> <9FD17562-7561-4BCA-8875-BC1BC45CF50A@cs.utah.edu> <281B0F6D-4ACD-40EC-881C-1CBE6180CA1E@cs.utah.edu> <C3C8ABE0-58E2-487F-9299-E0B8019A76FC@gmail.com> <7ACB05F8-AC02-49C9-8FFE-D9544C8E1821@cs.utah.edu> <4CE2B44D-4DE4-40B8-812E-B2AD9CC04C83@gmail.com> <20140108220057.GJ80055@flux.utah.edu> <BFF2BE5C-ED6B-4AE7-8FF7-EE874062552E@gmail.com>
> 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.
Lbs