technofab/zfs-localpv
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/zfs-localpv.git synced 2026-02-02 15:45:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(ci): updating branch reference from master to develop(HEAD) (#384) (#385)

Browse source 
* chore(ci): updating branch reference from master to develop(HEAD) (#384)


Signed-off-by: mittachaitu <sai.chaithanya@mayadata.io>
Co-authored-by: sai chaithanya <sai.chaithanya@mayadata.io>
This commit is contained in:
Kiran Mova 2021-09-15 18:58:12 +05:30 • committed by GitHub
parent 95428184cc
commit 9d2966057a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 73 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

46
docs/developer-setup.md
View file

@ -25,7 +25,7 @@ git clone https://github.com/$user/zfs-localpv.git
cd zfs-localpv
git remote add upstream https://github.com/openebs/zfs-localpv.git
# Never push to upstream master
# Never push to upstream develop
git remote set-url --push upstream no_push
# Confirm that your remotes make sense:
@ -44,15 +44,15 @@ Open a terminal on your local host. Change directory to the zfs-localpv fork roo
$ cd zfs-localpv
```
Checkout the master branch.
Checkout the develop branch.
```sh
$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
$ git checkout develop
Switched to branch 'develop'
Your branch is up-to-date with 'origin/develop'.
```
Recall that origin/master is a branch on your remote GitHub repository.
Recall that origin/develop is a branch on your remote GitHub repository.
Make sure you have the upstream remote openebs/zfs-localpv by listing them.
```sh
@ -68,43 +68,43 @@ $ cd zfs-localpv
```sh
$ git remote add upstream https://github.com/openebs/zfs-localpv.git
```
Fetch all the changes from the upstream master branch.
Fetch all the changes from the upstream develop branch.
```sh
$ git fetch upstream master
$ git fetch upstream develop
remote: Counting objects: 141, done.
remote: Compressing objects: 100% (29/29), done.
remote: Total 141 (delta 52), reused 46 (delta 46), pack-reused 66
Receiving objects: 100% (141/141), 112.43 KiB | 0 bytes/s, done.
Resolving deltas: 100% (79/79), done.
From github.com:openebs/zfs-localpv
* branch master -> FETCH_HEAD
* branch develop -> FETCH_HEAD
```
Rebase your local master with the upstream/master.
Rebase your local develop with the upstream/develop.
```sh
$ git rebase upstream/master
$ git rebase upstream/develop
First, rewinding head to replay your work on top of it...
Fast-forwarded master to upstream/master.
Fast-forwarded develop to upstream/develop.
```
This command applies all the commits from the upstream master to your local master.
This command applies all the commits from the upstream develop to your local develop.
Check the status of your local branch.
```sh
$ git status
On branch master
Your branch is ahead of 'origin/master' by 38 commits.
On branch develop
Your branch is ahead of 'origin/develop' by 38 commits.
(use "git push" to publish your local commits)
nothing to commit, working directory clean
```
Your local repository now has all the changes from the upstream remote. You need to push the changes to your own remote fork which is origin master.
Your local repository now has all the changes from the upstream remote. You need to push the changes to your own remote fork which is origin develop.
Push the rebased master to origin master.
Push the rebased develop to origin develop.
```sh
$ git push origin master
$ git push origin develop
Username for 'https://github.com': $user
Password for 'https://$user@github.com':
Counting objects: 223, done.
@ -112,16 +112,16 @@ $ cd zfs-localpv
Writing objects: 100% (69/69), 8.76 KiB | 0 bytes/s, done.
Total 69 (delta 53), reused 47 (delta 31)
To https://github.com/$user/zfs-localpv.git
8e107a9..5035fa1 master -> master
8e107a9..5035fa1 develop -> develop
```
### Contributing to a feature or bugfix.
Always start with creating a new branch from master to work on a new feature or bugfix. Your branch name should have the format XX-descriptive where XX is the issue number you are working on followed by some descriptive text. For example:
Always start with creating a new branch from develop to work on a new feature or bugfix. Your branch name should have the format XX-descriptive where XX is the issue number you are working on followed by some descriptive text. For example:
```sh
$ git checkout master
# Make sure the master is rebased with the latest changes as described in previous step.
$ git checkout develop
# Make sure the develop is rebased with the latest changes as described in previous step.
$ git checkout -b 1234-fix-developer-docs
Switched to a new branch '1234-fix-developer-docs'
```
@ -145,7 +145,7 @@ Happy Hacking!
```sh
# While on your myfeature branch (see above)
git fetch upstream
git rebase upstream/master
git rebase upstream/develop
```
While you rebase your changes, you must resolve any conflicts that might arise and build and test your changes using the above steps.