| 123456789101112131415161718192021222324252627 |
- this is a temporary directory for the purpose of merging with the upstream
- after the merge is ready to be committed - this directory and all files within should be deleted and any commits squashed into the commit 'merge upstream/master' just above the most recent notabug commit '032f17f4506357c586c7cdbcd50222d29616812b - Add outage of 31-01-2016'
- this directory contains the folowing files:
- auto-merge-result
- - this file is the original report noting the changes that were made automatically by `git merge upstream/develop`
- merge-conflicts
- - this file is the result of filtering only the conflicts from the 'auto-merge-result' file with `grep CONFLICT auto-merge-result`
- git-status
- - this file is the reult of `git status` immediately after the merge but before the commit where the files on this directory were added
- git-diff
- - this file is the reult of `git diff` immediately after the merge but before the commit where the files on this directory were added
- dependency-issues
- - this file contains notes related to package management
- build-recipe
- - this file is a working draft of what could be a developers readme
- README-UPGRADE
- - this file
|
