Skip to content
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

Documentation (resolved conflict) #126

Conversation

Eliott-Guevel
Copy link
Contributor

@Eliott-Guevel Eliott-Guevel commented Oct 26, 2023

Completely reworked Create a Component (now called Create and connect Components), made a summary, created Principles.md, modified some pages

It's not complete but still more accessible

@labordep labordep changed the base branch from main to documentation October 26, 2023 14:02
@labordep
Copy link
Member

labordep commented Oct 26, 2023

@Eliott-Guevel you need to push into documentation branch. I move to this but there are some conflicts to resolve.

@Eliott-Guevel
Copy link
Contributor Author

The conflicts come from the modification of the files' name, I have a branch that doesn't modify them since I don't know how it can be solved currently (the branch I'm doing the pull request from is a copy of the current Molecule repository with only the files' content and name modified

@labordep
Copy link
Member

@Eliott-Guevel I have found the problem, take a look here: https://github.com/Eliott-Guevel/Molecule-various-fixes/blob/documentation2-newFileNames/documentation/Table%20of%20contents.md
Read the conflicting report and you will find.

@Eliott-Guevel Eliott-Guevel deleted the documentation2-newFileNames branch October 30, 2023 11:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants