Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Initial content for page added

Peter Ashford 2018-05-28 00:29:47 -07:00
parent 328de85a28
commit 79e8a541e6
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Workflow-Rebase.md Normal file

@ -0,0 +1,18 @@
# Rebase the Update
Updates to the ZFS on Linux project should always be based on the current *master* branch. This makes them easier to merge into the repository.
There are two steps in the rebase process. The first step is to update the *local master* branch from the *upstream master* repository. This can be done by entering the following commands:
```
$ git fetch upstream master
$ git checkout master
$ git merge upstream/master
```
The second step is to perform the actual rebase of the updates. This is done by entering the command `git rebase upstream/master`. If there are any conflicts between the updates in your *local* branch and the updates in the *upstream master* branch, you will be informed of them, and allowed to correct them (see the [Conflicts][W-conflicts] page).
This would also be a good time to [*squash*][W-squash] your commits.
[W-conflicts]: https://github.com/zfsonlinux/zfs/wiki/Workflow-Conflicts
[W-squash]: https://github.com/zfsonlinux/zfs/wiki/Workflow-Squash

0
Workflow/Rebase.md