Skip to content
This repository has been archived by the owner on Oct 8, 2020. It is now read-only.

Migrate and re-organize lots of things about git, GitHub, and contributing #275

Closed
wants to merge 11 commits into from

Conversation

seancolsen
Copy link
Contributor

@seancolsen seancolsen commented Aug 13, 2017

This PR does quite a bit of updating! I've tagged some people which I think might be interested in having a look.

Import content from:

Re-organize:

New pages on:

  • Git, GitHub, and GitLab
  • Issue tracking
  • Jenkins
  • Release process

New content on:

  • Comparing our issue tracking systems
  • Rebasing
  • Managing multiple git remotes

Dropped content (which was in wiki pages) on:

  • Super detailed steps for doing lots of git operations — I don't think we should maintain these sort of docs. I tried to offer some theoretical explanations of how to use git with CiviCRM, but I left a lot of the specific steps up to the reader to learn (and provided additional links for external resources)
  • Screenshots of GitHub

Closes #61

Reviews welcome. I will merge this in one week (on 2017-08-20) if there are no comments.

(cherry picked from commit 951cbe1)
(cherry picked from commit ed64a25)
https://wiki.civicrm.org/confluence/display/CRMDOC/Git+Commit+Messages+for+CiviCRM

This isn't exactly an import. More of a re-write.

(cherry picked from commit 5fe569a)
(cherry picked from commit 36afd33)
(cherry picked from commit 65bf89b)
(cherry picked from commit 86da3ad)
(cherry picked from commit c3845c4)
These lines got in there from a little git branching mixup. Whoops!
seancolsen added a commit to seancolsen/civicrm-core that referenced this pull request Aug 13, 2017
This ia a non-functional
change. In civicrm/civicrm-dev-docs#275
I migrated some of the content from CONTRIBUTING.md into the
Developer Guide. This commit removes that content from
CONTRIBUTING.md and puts hyerlinks in its place.
@seancolsen
Copy link
Contributor Author

I'm closing this PR because I (accidentally) merged these commits when I merged #273. (I think I must have based the branch for #273 on the branch for this PR by mistake. Ooops!!)

I still welcome reviews on these changes and am happy to make further edits in the published guide. Also I'll work on being more careful when creating new branches, taking care to always explicitly base them on master.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
1 participant