git stash show will show you what was stashed.
On 04/09/2013 02:44 PM, Tom Palarz wrote:
Since the repo forall git stash worked, and most likely removed most remnants
that would have been useful in debugging this, I'll need to try from the
beginning to reproduce this. Will re-post once I do, but I needed to get
something working quickly and that seems to have worked.
----
Tom Palarz
Security Consultant
Neohapsis, Inc.
773-269-6300 x301
312-231-9834 m
773-394-8314 f
[email protected]
www.neohapsis.com
The contents of this transmitted message are confidential and may be subject to
privilege. Disclosure, copying, distribution, or use of the contents of this
transmission or information it contains is prohibited if you have received this
transmission in error. If you are not the named recipient, please immediately
notify the sender and destroy all copies you have received.
-----Original Message-----
From: Stephen Smalley [mailto:[email protected]]
Sent: Tuesday, April 09, 2013 11:26 AM
To: Tom Palarz
Cc: [email protected]
Subject: Re: Seandroid 4.2.2 release repo sync error - bad merge?
On 04/09/2013 10:34 AM, Tom Palarz wrote:
Repo sync –d resulted in the same errors. Repo forall git –c stash and then
repo sync did seem to do the checkouts appropriately. My suspicion is still
make clobber. There, of course, is definitely the possibility that a fat-finger
was involved somewhere, too, though.
So cd to one of the offending projects, e.g. build, and run git stash show to
see what exactly was modified.
I couldn't reproduce it here.
--
This message was distributed to subscribers of the seandroid-list mailing list.
If you no longer wish to subscribe, send mail to [email protected] with
the words "unsubscribe seandroid-list" without quotes as the message.
--
This message was distributed to subscribers of the seandroid-list mailing list.
If you no longer wish to subscribe, send mail to [email protected] with
the words "unsubscribe seandroid-list" without quotes as the message.
