Sounds great -- it's just the two from midday today (macro modification
+ test tags).
On 10/26/2012 04:07 PM, Shawn Wells wrote:
On 10/26/12 3:46 PM, David Smith wrote:
> This happened before I pushed my last two commits, and I was
> wondering why git suddenly exploded. I'm seeing unmerged paths
> referring to the files that were sitting in the aforementioned commits.
>
> Are the instructions below pertinent to this situation, or just for
> those joining on the project from this point forward? Apologies for
> the (likely) newbie-ish question.
I figured there would be a few people caught in this situation. Kick
your patches over to the list and I'll push them, at which point you
can re-clone.
_______________________________________________
scap-security-guide mailing list
scap-security-guide(a)lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide