Closed SterVeen closed 8 years ago
Have you tried to first merge my python3 branch with yours, and then make the pull request?
Cheers, Michiel
SterVeen writes:
The pull request doesn't completely work. I think some changes are there already. The main request is for the scripts/report_global_status file. You can view, comment on, or merge this pull request online at:
https://github.com/brentjens/pyautoplot/pull/6
-- Commit Summary --
- Update main.py
- Update utilities.py
- Update main.py
- Merge pull request #2 from brentjens/python3
- Update report_global_status
- Update main.py
-- File Changes --
M pyautoplot/main.py (8) M pyautoplot/utilities.py (2) M scripts/report_global_status (10)
-- Patch Links --
https://github.com/brentjens/pyautoplot/pull/6.patch https://github.com/brentjens/pyautoplot/pull/6.diff
You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/brentjens/pyautoplot/pull/6
Dr. Michiel A. Brentjens LOFAR Observatory Astronomer Astron Netherlands Institute for Radio Astronomy Oude Hoogeveensedijk 4 7991 PD Dwingeloo The Netherlands Office: (+31) (0)521 - 595 781 Reception: (+31) (0)521 - 595 100 brentjens@astron.nl http://www.astron.nl/~brentjens/
Hi Sander,
could you please first merge my python3 branch with your python3-patch branch and then make the pull request? I have now manually updated report_global_status.
There is also a conflict the other way around. If you have updated report_global_status then all the bug fixes should be there, and we can close this request.
The pull request doesn't completely work. I think some changes are there already. The main request is for the scripts/report_global_status file.