summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2017-04-24 19:39:17 +0300
committerAndrew Dolgov <[email protected]>2017-04-24 19:39:17 +0300
commit32afe2ba33acc0a01fb51aa73271c0f2b21a7e4f (patch)
treeae36024f573cff64846144e50661bd9491ed70ed
parentf63e4a08df2caa704e629f276da5f11c90ecc227 (diff)
parent3ca926297d27082885d25b6f3e9c5675d9395cfa (diff)
Merge branch 'master' of git.tt-rss.org:fox/tt-rss-android
-rw-r--r--CONTRIBUTING.md9
-rw-r--r--README.md3
2 files changed, 10 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..172084f5
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,9 @@
+## Contributing code the right way
+
+*or: how I learned to post merge requests without crying myself to sleep*
+
+1. Post your idea on the forums. Preferably post diffs if you got them. Mention your gitlab username.
+2. If your idea was accepted, request developer permissions for the project via Gitlab.
+2. When you have developer privileges you can make branches, check them out, work on them locally, push them back and post merge requests.
+3. Usual stuff applies: don't post unrelated issues in one merge request, try to not screw up indenting (tt-rss mostly uses tab characters), try to respect surrounding formatting style, etc.
+4. That's it. \ No newline at end of file
diff --git a/README.md b/README.md
index ee6b8b09..2b76746d 100644
--- a/README.md
+++ b/README.md
@@ -20,5 +20,4 @@ Copyright (c) 2011 Andrew Dolgov (unless explicitly stated otherwise).
## See also
-* FAQ: http://tt-rss.org/redmine/projects/tt-rss-android/wiki/#FAQ
-* Forum: http://tt-rss.org/forum
+* Forum: http://tt-rss.org/forum \ No newline at end of file