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

Restructure of the Getting Started section #64

Merged
merged 7 commits into from
Jan 29, 2020
Merged

Restructure of the Getting Started section #64

merged 7 commits into from
Jan 29, 2020

Conversation

phschimm
Copy link
Member

  • Simplified master.asciidoc structure (by introducing master-contributing.asciidoc in /general)
  • Renamed some files:
    • master-release-notes.asciidoc (to better comply with the guidelines)
    • oss-compliance.asciidoc (shorter, better to identify)
  • Moved introduction sections to the getting-started repo (see PR#19)

@jambulud
Copy link
Member

jambulud commented Jan 27, 2020

Could you solve the merge conflict?

<<<<<<< getting_started_rework
[submodule "getting-started.wiki"]
	path = getting-started.wiki
	url = https://github.com/devonfw/getting-started.wiki.git
=======
[submodule "cobigen.wiki"]
	path = cobigen.wiki
	url = https://github.com/devonfw/cobigen.wiki.git
>>>>>>> master

It's an easy to solve conflict because both submodules should be on devonfw-guide

@sjimenez77 sjimenez77 merged commit 8405484 into devonfw:master Jan 29, 2020
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.

3 participants