-
Notifications
You must be signed in to change notification settings - Fork 59
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
FC-0068: Adding and converting txt files into rst format #699
base: main
Are you sure you want to change the base?
Conversation
adding and cleaning up for create_unit.rst
Thanks for the pull request, @jesgreco! This repository is currently maintained by @openedx/docs-openedx-org-maintainers. Once you've gone through the following steps feel free to tag them in a comment and let them know that your changes are ready for engineering review.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have "duplicate label" warnings in your build. They are coming because we already have "create a section", "create a subsection", and "create a unit" targets.
So the question becomes where you got these instructions from? I think you got them from the old .txt files, and didn't write this anew?
In that case, the short term fix might be to give these unique target names. But please bring this up in your next meeting, because this is a scenario where we have two very overlapping how-tos, and we should fix that together.
@jswope00 ok! I'll write this in our channel to see if we can have a solution before the next meeting which will be 8th January. |
@jswope00 I've solved the conflict for merging but, still we need to solve the label duplication. |
1 similar comment
@jswope00 I've solved the conflict for merging but, still we need to solve the label duplication. |
We have duplicate files and labels for "Create a Subsection" "Create a Section" and "Create a Unit". Here is what needs to happen here.
|
@jswope00 I've deleted the duplicated files, and try to include one single file (create.rst) but, then I've realized they are all included. So, there is no need to include a "golden-copy" file. Let me know if you agree on this. |
Just to clarify this commit for anyone looking at it in the future.
Because those files already exist as create_hide_delete_sections.rst and create_edit_publish_subsections.rst. So this removes the redundancy. |
@jesgreco can you resolve the conflicts on this one? |
so, I assume we can proceed with this PR to be merged. |
@jesgreco we can't merge the PR until the conflicts are resolved (Git won't let us). |
I believe we should delete this PR since there were duplication of files within this PR, and now no changes are included in this PR. If we delete the PR, those conflicts should be solved (and I cannot solve them since I don't have write access). |
You only need write access to your own branch to solve conflicts, could you get someone on your team to help you out? I don't want to assume just because there are conflicts that there's nothing useful in this PR. |
adding and cleaning up for create_unit.rst