search

GovReady / compliancekbs

Compliance Knowledge Base Service for Security Controls Compliance Server
http://kbs.govready.com
GNU Affero General Public License v3.0
6 stars 7 forks source link

First half of Dept. of Education Docs #43

Closed MCupp93 closed 8 years ago

gregelin commented 8 years ago

I think these are missing title: keys?

Can you show me how you are testing locally?

MCupp93 commented 8 years ago

Okay. I feel like I must be missing something. What exactly is meant by title: Keys?

gregelin commented 8 years ago

Every file needs to have a title. Add a line in each file beginning with the key "title: " followed by title. See other files for example.

Sent from my iPhone

On Jun 22, 2016, at 9:32 AM, Matthew Cupp notifications@github.com wrote:

Okay. I feel like I must be missing something. What exactly is meant by title: Keys?

— You are receiving this because you commented. Reply to this email directly, view it on GitHub, or mute the thread.

MCupp93 commented 8 years ago

Okay I see what I did wrong now. The DoD ones have them but for some reason I neglected to push the changes to the AWS documents with the titles in them.. Going to create a new pull request.

gregelin commented 8 years ago

Did you pull before updating? Have I shown you how to do that?

Sent from my iPhone

On Jun 22, 2016, at 9:55 AM, Matthew Cupp notifications@github.com wrote:

Okay I see what I did wrong now. The DoD ones have them but for some reason I neglected to push the changes to the AWS documents with the titles in them.. Going to create a new pull request.

— You are receiving this because you commented. Reply to this email directly, view it on GitHub, or mute the thread.

MCupp93 commented 8 years ago

I thought I did, in the command line it said everything was up to date. But now on github and in the command line when trying to do it it is telling me there is conflicts and won't let me merge.

MCupp93 commented 8 years ago

I think I see the problem. I thought I had done the pull correctly but it's looking like I did something wrong. And now that I've done it correctly it pulled in your changes to the AWS docs and there is now a conflict. I think I'm going to need assistance resolving it, I've tried looking it up but can't seem to get it.

gregelin commented 8 years ago

No worries. All good learning.

There is pulling into your local version from your repo, then there is pulling in the upstream origin into your repo.

Conflicts are easier to resolve than you would think. Give a couple a try.

Sent from my iPhone

On Jun 22, 2016, at 10:23 AM, Matthew Cupp notifications@github.com wrote:

I think I see the problem. I thought I had done the pull correctly but it's looking like I did something wrong. And now that I've done it correctly it pulled in your changes to the AWS docs and there is now a conflict. I think I'm going to need assistance resolving it, I've tried looking it up but can't seem to get it.

— You are receiving this because you commented. Reply to this email directly, view it on GitHub, or mute the thread.