search

OrchardCMS / OrchardDoc

Documentation for Orchard 1.x (not Orchard Core, for that see https://docs.orchardcore.net/).
http://docs.orchardproject.net
142 stars 242 forks source link

Label Archived documents #310

Closed jean closed 8 years ago

rtpHarry commented 8 years ago

This one has a conflict now because of the changes you made to Themes-includes.markdown in the last PR.

You need to merge the latest master into your branch and resolve the merge conflicts before I can accept this one.

In future you should take these steps:

  1. Open an issue on Docs repo
  2. Switch to your master branch
  3. Pull the latest master branch
  4. Make a new branch for yourself to target the specific issue number you're fixing
  5. Make your changes
  6. Push to that new branch
  7. Create the PR to merge that branch into the master branch of Docs

Then when you have a new issue, you go back and do the same thing. One branch for each issue you're solving. That way if you get feedback to make extra changes you can just push more changes on to that branch and it will be automatically added to the PR.

jean commented 8 years ago

Conflict resolved :-) I'll endeavour to branch from clean master in the future.

rtpHarry commented 8 years ago

Thanks for all the updates 👍