Since the sprint2-sprint3 branch was rebased and merged to master today, Victoria's branch has conflicts when merged. I took the library of rebasing her branch on master and pushing to a collab branch:
collab/dyrcona/lp1502292-add_volumes_from_bib_record-rebase
http://git.evergreen-ils.org/?p=working/Evergreen.git;a=shortlog;h=refs/heads/collab/dyrcona/lp1502292-add_volumes_from_bib_record-rebase
The rebase was clean so I didn't modify anything.
Since the sprint2-sprint3 branch was rebased and merged to master today, Victoria's branch has conflicts when merged. I took the library of rebasing her branch on master and pushing to a collab branch:
collab/ dyrcona/ lp1502292- add_volumes_ from_bib_ record- rebase
http:// git.evergreen- ils.org/ ?p=working/ Evergreen. git;a=shortlog; h=refs/ heads/collab/ dyrcona/ lp1502292- add_volumes_ from_bib_ record- rebase
The rebase was clean so I didn't modify anything.