Resources/Code repository - Revision history

Dan: Fix header sizes

2019-08-14T21:21:50Z

Fix header sizes

Dan: Update links; add section on branch organization

2019-08-14T21:21:00Z

Update links; add section on branch organization

Dan: /* Create patches or pull requests */ Add note about code review

2015-06-19T22:19:55Z

‎Create patches or pull requests: Add note about code review

184.69.130.182: /* Create patches */

2015-05-22T00:15:15Z

‎Create patches

184.69.130.182: /* Browse our code on GitHub */

2015-05-22T00:11:46Z

‎Browse our code on GitHub

184.69.130.182: /* AtoM and Git */ Add more resources

2015-05-22T00:08:51Z

‎AtoM and Git: Add more resources

75.155.187.11: /* AtoM and Git */

2015-05-21T21:37:20Z

‎AtoM and Git

184.69.130.182: /* Browse our code on GitHub */

2015-05-21T21:36:52Z

‎Browse our code on GitHub

75.155.187.11: /* AtoM and Git */

2015-05-21T21:36:43Z

‎AtoM and Git

75.155.187.11: /* AtoM and Git */

2015-05-21T21:31:08Z

‎AtoM and Git

@@ Line 52: / Line 52: @@
 </admonition>
-==Branch organization==
+===Branch organization===
 In general, we maintain 2 primary branches of AtoM - a stable branch, and a development branch. New features and/or breaking changes are always added to the development branch - prefaced by <code>qa/</code> - for example, the development branch for the 2.6 release would be <code>qa/2.6.x</code>. For non-security related bug fixes, we do not generally backport these to earlier releases, and recommend that users upgrade to the latest stable version instead.

@@ Line 51: / Line 51: @@
 * [https://help.github.com/ GitHub help]
 </admonition>
 ===Checkout===
@@ Line 61: / Line 68: @@
 We put the detailed installation instructions, including the instructions on downloading or checking out AtoM, in the "Linux" page of the Installation section of our Administrator's manual.
-For example, here is a link to the 2.1 "Download AtoM" section:
+For example, here is a link to the "Download AtoM" section - see option 2:
-* https://accesstomemory.org/docs/2.1/admin-manual/installation/linux/#download-atom
+* https://accesstomemory.org/docs/latest/admin-manual/installation/linux/#download-atom
@@ Line 82: / Line 89: @@
 <admonition type="important">
 Note that we will always perform a code review before accepting any pull requests or patches, to make sure that all code in AtoM is consistent, and maintainable. See:
-* [[#Resources/Code repository|Back to top]]
+-----
 [[Category:Resources]]

@@ Line 2: / Line 2: @@
 [[Main Page]] > [[Resources]] > Resources/Code repository
 On this page you'll find information on AtoM's code repository - where to find the code, and useful suggestions for how to take advantage of it for development.
 <admonition type="seealso">
@@ Line 18: / Line 18: @@
 See  [http://git-scm.com/documentation Git's official documentation]  and their list of [http://git-scm.com/documentation/external-links external resources] for more information on how to use Git.
 If you're a visual learner, check out "Visualizing Git Concepts with D3," by Wei Wang - Wei has created an experimental tutorial site where you can try out basic git commands, and see the effects visualized as an interactive tree:
 * http://onlywei.github.io/explain-git-with-d3/
@@ Line 54: / Line 54: @@
 ===Checkout===
 Our installation instructions always include, in the "Download AtoM" section, the option to check the code out from our repository, or download a tarball. Please be sure to check the relevant section in our docs, depending on which version of AtoM you are installing. We version all our documentation per major release - you can find an index of the versions available here:
 * https://www.accesstomemory.org/docs
 We put the detailed installation instructions, including the instructions on downloading or checking out AtoM, in the "Linux" page of the Installation section of our Administrator's manual.
 For example, here is a link to the 2.1 "Download AtoM" section:
 * https://accesstomemory.org/docs/2.1/admin-manual/installation/linux/#download-atom
@@ Line 79: / Line 79: @@
 See the [[Development/Contribute code|Contribute code]] page for details on how to fix bugs and contribute patches.

← Older revision		Revision as of 00:15, 22 May 2015
Line 76:		Line 76:


−	=== Create patches ===	+	=== Create patches or pull requests===

	See the [[Development/Contribute code\|Contribute code]] page for details on how to fix bugs and contribute patches.		See the [[Development/Contribute code\|Contribute code]] page for details on how to fix bugs and contribute patches.

@@ Line 46: / Line 46: @@
 * Code repository web interface: https://github.com/artefactual/atom
 * List of changes committed to the repository: https://github.com/artefactual/atom/commits/
 ===Checkout===

← Older revision		Revision as of 00:08, 22 May 2015
Line 17:		Line 17:

	See [http://git-scm.com/documentation Git's official documentation] and their list of [http://git-scm.com/documentation/external-links external resources] for more information on how to use Git.		See [http://git-scm.com/documentation Git's official documentation] and their list of [http://git-scm.com/documentation/external-links external resources] for more information on how to use Git.
		+
		+	If you're a visual learner, check out "Visualizing Git Concepts with D3," by Wei Wang - Wei has created an experimental tutorial site where you can try out basic git commands, and see the effects visualized as an interactive tree:
		+
		+	* http://onlywei.github.io/explain-git-with-d3/
		+
		+
		+	For resources about Git specific to GitHub, check out the list of topics available in GitHub's help desk:
		+
		+	* https://help.github.com/

	===Git clients===		===Git clients===

@@ Line 12: / Line 12: @@
 ===AtoM and Git===
-The AtoM project source code is managed with [https://en.wikipedia.org/wiki/Revision_control version control] software called [http://git-scm.com/ Git] and is publicly hosted by the popular [https://github.com/ GitHub] git repository hosting service. Git enables users and developers to keep updated when changes are made to the code while managing any conflicts with local changes made to the code. Git also allows users to retrieve the code as it existed at any time in the past. Git is an open source project.
+The AtoM project source code is managed with [https://en.wikipedia.org/wiki/Revision_control version control] software called [http://git-scm.com/ Git] and is publicly hosted by the popular [https://github.com/ GitHub] git repository hosting service. Git enables users and developers to keep updated when changes are made to the code while managing any conflicts with local code changes. Git also allows users to retrieve the code as it existed at any time in the past. Git is an open source project.
 A lot of community documentation exists for Git. The [http://git-scm.com/book Pro Git book] is written by Scott Chacon, the CIO of GitHub, a popular site which provides free Git hosting for open source projects and provides web-based code browsing and issue tracking. Git Pro is published by Apress. You can [http://www.amazon.ca/Pro-Git-Scott-Chacon/dp/1484200772/ buy a copy] or read it for free on the web.

@@ Line 33: / Line 33: @@
 ===Browse our code on GitHub===
-The public code repository for AtoM is hosted at Github.
+The public code repository for AtoM is hosted at GitHub.
 * Code repository web interface: https://github.com/artefactual/atom
 * List of changes committed to the repository: https://github.com/artefactual/atom/commits/
 ===Checkout===