Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
purescript-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
133
Issues
133
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
purescript-gargantext
Commits
bf07fe84
Commit
bf07fe84
authored
Dec 21, 2018
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DOC] Gitlab collaboration tips.
parent
3cff08f6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
3 deletions
+19
-3
CONTRIBUTING.md
CONTRIBUTING.md
+19
-3
No files found.
CONTRIBUTING.md
View file @
bf07fe84
...
...
@@ -50,9 +50,25 @@ Git is the main Concurrent Version system used by the project.
#### Git branches
Main branches are:
*
`master/prod`
: stable version used by end users
*
`testing`
: candidate version for stable, tested by end users
*
`dev`
: unstable version for developers only
*
`master`
: stable and prod version used by end users
*
`testing`
: candidate version for stable, tested by end users
*
`dev`
: unstable version for developers only
#### Adding a new feature / fixing an issue
1.
You should have an open issue in gitlab with number ~#XXX~.
2.
~git checkout -b issue-XXX-issue-short-description~
3.
work... ~git commit~ many times
4.
Optionally you can clean up your git log history with ~git rebase -i master~
5.
Test locally ~./build.sh (TODO && ./build/run-tests.sh)
6.
~git push -u~ will push and create the branch on gitlab
7.
Open a PR. In the PR reference the issue by writing (~Close #XXX~ or
~Connects to #XXX~).
8.
Make changes according to PR feedbacks
9.
Either use the =Squash & Merge button= in github or manually rebase. Please
take the time to write a good commit message. For example be inspired by
https://chris.beams.io/posts/git-commit/
##### Git Tips
*
fix the conflicts on your own branch before asking for
[
PR
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment