MMD Schema with Git: Difference between revisions

From MusicBrainz Wiki
Jump to navigationJump to search
No edit summary
No edit summary
 
(10 intermediate revisions by the same user not shown)
Line 1: Line 1:
===Checkout Schema, particular branch===
===Checkout Schema, particular branch===
Checking out git schema, swicthing to another branch and making changes to that branch
Checking out git schema
<pre>
<pre>
git clone https://github.com/metabrainz/mmd-schema.git mmd-schema
git clone https://github.com/metabrainz/mmd-schema.git mmd-schema
cd mmd-schema
</pre>
</pre>


===Possible create new branch following changes===
===Possible create new branch following changes===
We may just want to branch from master
Add mapping to remote repos we are interested
<pre>
Then create new branch that tracks the branch in that remote repository containing the changes we are interested in
git checkout -b mbs-799
</pre>


alternatively we may want to branch from another remote repos we are interested, then create new branch that tracks the branch in that remote repository containing the changes we are interested in
<pre>
<pre>
git remote add ian https://ianmcorvidae@bitbucket.org/ianmcorvidae/mmd-schema.git;
git remote add ian https://ianmcorvidae@bitbucket.org/ianmcorvidae/mmd-schema.git;
Line 14: Line 20:
</pre>
</pre>


===Make Chnages ===
===Make Changes ===
Edit Files
Edit Files


Line 26: Line 32:
git commit -a -m "message"
git commit -a -m "message"
</pre>
</pre>

===Remove any files no longer needed===
--TODO how do we do this


===Send to my remote Repos ===
===Send to my remote Repos ===
Line 37: Line 46:
===Request other review Changes ===
===Request other review Changes ===
Login to BitBucket
Login to BitBucket

Go to my new repository and 'Pull'
Go to my new repository and 'Pull'

Choose ijabz/metabrainz-schema and branch from left hand side

Choose the metabrainz-mmdschema repos and master branch on the right-handside

Add Reviewers
Add Reviewers


===Wait for Reviews===
===Wait for Reviews===
Need at least two
Need at least two
If okay then request my pull request is merged into main branch
If okay then request my pull request is merged into main repository

===Sync Repos===
Once it has been merged, then use Bitbucket to sync your repository with the mions repos

Latest revision as of 08:54, 29 April 2014

Checkout Schema, particular branch

Checking out git schema

git clone https://github.com/metabrainz/mmd-schema.git mmd-schema
cd mmd-schema

Possible create new branch following changes

We may just want to branch from master

git checkout -b mbs-799


alternatively we may want to branch from another remote repos we are interested, then create new branch that tracks the branch in that remote repository containing the changes we are interested in

git remote add ian https://ianmcorvidae@bitbucket.org/ianmcorvidae/mmd-schema.git; 
git fetch ian 
git checkout --track -b mbs-799 ian/mbs-799;

Make Changes

Edit Files

Pick up any additional changes if neccessary

git pull

Commit files to my local version

git commit -a -m "message"

Remove any files no longer needed

--TODO how do we do this

Send to my remote Repos

Create new remote reopos forked from mmd-schema in bitbucket Then map to it and push my branch to it.

git remote add ijabz1 https://ijabz@bitbucket.org/ijabz/mmd-schema.git
git push ijabz1 mbs-799

Request other review Changes

Login to BitBucket

Go to my new repository and 'Pull'

Choose ijabz/metabrainz-schema and branch from left hand side

Choose the metabrainz-mmdschema repos and master branch on the right-handside

Add Reviewers

Wait for Reviews

Need at least two If okay then request my pull request is merged into main repository

Sync Repos

Once it has been merged, then use Bitbucket to sync your repository with the mions repos