Commit cf190453 authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

DOC: Note about diffing release branch with master

parent 7d532edf
......@@ -296,8 +296,12 @@ This can be accomplished using the following process:
git merge origin/master
```
4. Resolve any conflicts that arise, making sure that internal-only FSL
packages are not included in the package lists.
packages are not included in the package lists. A good idea is to compare
your branch with the `master` branch - usually the only difference should
be that your branch does not contain any internal-only packages:
```
git diff origin/master HEAD
```
5. Merge your branch into the `external` branch on the `fsl/conda/manifest`
GitLab repository via a merge request. This will result in new manifest
and environment files for a new development release to be created.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment