[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gits] Branch Help
- Subject: [gits] Branch Help
- From: eeide at cs.utah.edu (Eric Eide)
- Date: Wed, 08 Jan 2014 11:58:47 -0700
- In-reply-to: <CAHhYwBhLPSTW7Jyze=asYEi1qdQiV=+mG5XGzu0Pnr1zPA1zYQ@mail.gmail.com> (Kirk Webb's message of "Wed, 8 Jan 2014 11:47:21 -0700")
- References: <EB1A229F-7EC9-4366-A58F-90069861241F@gmail.com> <CAHhYwBh41Hu2RjTacgF56dodTSgq6hc=2jBjS8-DqOZ1iWA1JA@mail.gmail.com> <4D9D6318-C254-407A-99E0-C038B3D0886C@gmail.com> <CAHhYwBhLPSTW7Jyze=asYEi1qdQiV=+mG5XGzu0Pnr1zPA1zYQ@mail.gmail.com>
Kirk> Yes, but make sure you use the '-f' flag to force it. I always
Kirk> have to do this (and I do it all the time with my own branches).
1. Ouch.
2. I'm not sure we allow non-ff updates to emulab-devel, but perhaps I am wrong
and/or the shield generator is down.
--
-------------------------------------------------------------------------------
Eric Eide <eeide at cs.utah.edu> . University of Utah School of Computing
http://www.cs.utah.edu/~eeide/ . +1 (801) 585-5512 voice, +1 (801) 581-5843 FAX