Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2018-05-28 13:10:47 +0000
committerOlivier Constant2018-05-28 13:10:47 +0000
commite96829af3676848719d1ff32a781a03c2cb6968e (patch)
treec4763bf6cbe8c5e4a8749d9ec00d41b2e267f1c9 /CONTRIBUTING.txt
parent4b12a2aef25cd9f8b0129725420449b6319c879e (diff)
downloadorg.eclipse.emf.diffmerge.core-e96829af3676848719d1ff32a781a03c2cb6968e.tar.gz
org.eclipse.emf.diffmerge.core-e96829af3676848719d1ff32a781a03c2cb6968e.tar.xz
org.eclipse.emf.diffmerge.core-e96829af3676848719d1ff32a781a03c2cb6968e.zip
[releng] Update of contribution/notice files and copyright notices
Change-Id: I8fce49cd0fbe1bd2a201e7413cf74beb4cf5ca30 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'CONTRIBUTING.txt')
-rw-r--r--CONTRIBUTING.txt71
1 files changed, 39 insertions, 32 deletions
diff --git a/CONTRIBUTING.txt b/CONTRIBUTING.txt
index b0f38664..12d99cbb 100644
--- a/CONTRIBUTING.txt
+++ b/CONTRIBUTING.txt
@@ -1,53 +1,60 @@
-Contributing to EMF Diff/Merge
-==============================
+# Contributing to EMF Diff/Merge
Thanks for your interest in this project.
+## Project description
-Project description:
---------------------
+Eclipse EMF Diff/Merge is a diff/merge tool for models. Its main purpose is to
+help build higher-level tools that need to merge models based on consistency
+rules. GUI components are also provided. Typical usages include model
+refactoring, iterative model transformations, bridges between models or modeling
+tools, collaborative modeling environments, or versioning systems.
-EMF Diff/Merge is a diff/merge tool for models. Its main purpose is to help build higher-level tools that need to merge models based on consistency rules. GUI components are also provided. Typical usages include model refactoring, iterative model transformations, bridges between models or modeling tools, collaborative modeling environments, or versioning systems.
-Link: EMF Diff/Merge Wiki
+* https://projects.eclipse.org/projects/modeling.emf.diffmerge
+* http://wiki.eclipse.org/EMF_DiffMerge
-- http://wiki.eclipse.org/EMF_DiffMerge
+## Developer resources
+Information regarding source code management, builds, coding standards, and
+more.
-Developer resources:
---------------------
+* https://projects.eclipse.org/projects/modeling.emf.diffmerge/developer
+* http://wiki.eclipse.org/EMF_DiffMerge
-Information regarding source code management, builds, coding standards, and more.
+The project maintains the following source code repositories
-- http://wiki.eclipse.org/EMF_DiffMerge/Developer
+* http://git.eclipse.org/c/diffmerge/org.eclipse.emf.diffmerge.core.git
+* http://git.eclipse.org/c/diffmerge/org.eclipse.emf.diffmerge.patterns.git
+* http://git.eclipse.org/c/diffmerge/org.eclipse.emf.diffmerge.coevolution.git
+* http://git.eclipse.org/c/diffmerge/org.eclipse.emf.diffmerge.patch.git
+This project uses Bugzilla to track ongoing development and issues.
-Contributor License Agreement:
-------------------------------
-
-Before your contribution can be accepted by the project, you need to create and electronically sign the Eclipse Foundation Contributor License Agreement (CLA).
-
-- http://www.eclipse.org/legal/CLA.php
-
-
-Contact:
---------
-
-Contact the project developers via the project's "dev" list.
+* Search for issues: https://eclipse.org/bugs/buglist.cgi?product=EMF.Diffmerge
+* Create a new report:
+ https://eclipse.org/bugs/enter_bug.cgi?product=EMF.Diffmerge
-- https://dev.eclipse.org/mailman/listinfo/diffmerge-dev
+Be sure to search for existing bugs before you create another one. Remember that
+contributions are always welcome!
+## Eclipse Contributor Agreement
-Search for bugs:
-----------------
+Before your contribution can be accepted by the project team contributors must
+electronically sign the Eclipse Contributor Agreement (ECA).
-This project uses Bugzilla to track ongoing development and issues.
+* http://www.eclipse.org/legal/ECA.php
-- https://bugs.eclipse.org/bugs/buglist.cgi?product=EMF.Diffmerge
+Commits that are provided by non-committers must have a Signed-off-by field in
+the footer indicating that the author is aware of the terms by which the
+contribution has been provided to the project. The non-committer must
+additionally have an Eclipse Foundation account and must have a signed Eclipse
+Contributor Agreement (ECA) on file.
+For more information, please see the Eclipse Committer Handbook:
+https://www.eclipse.org/projects/handbook/#resources-commit
-Create a new bug:
------------------
+## Contact
-Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome!
+Contact the project developers via the project's "dev" list.
-- https://bugs.eclipse.org/bugs/enter_bug.cgi?product=EMF.Diffmerge \ No newline at end of file
+* https://dev.eclipse.org/mailman/listinfo/diffmerge-dev

Back to the top