Merge master(1.7.3) into develop
Description
There are merge conflicts that can't be quickly resolved using Github's web editor. Gonna need a new branch for this and test it.
Environment
None
Activity
Show:
Bruce Hoff
January 19, 2018, 6:47 PM
That finding doesn't contradict that master was merged into develop. I.e. develop has advanced beyond master. We just looked at this diff:
https://github.com/Sage-Bionetworks/synapsePythonClient/compare/develop...master
and Github says "There isn’t anything to compare. develop is up to date with all commits from master."
Xavier Schildwachter
January 19, 2018, 5:29 AM
Currently not true (master==1.7.3 and develop=>1.7.4).
Ziming Dong
January 6, 2018, 1:42 AM
Diff of master into develop should be empty
