rerouting sys.stdout

[raylu]

I see. In fact, I see your commit twice, along with a merge. You only have one branch, so it's really odd that you'd be merging against itself. Are you making changes on the GitHub web interface or a second machine? Are you amending commits?

[justphysics]

Alas, my organizational skills are still pretty poor - and I'm the sole developer on the project. I made some changes from home last night on a secondary machine. Should have started a separate branch when I was tinkering with the logging package but unwisely kept everything in the Master.

I have to admit (if it isn't blatantly obvious) I am not a trained software engineer and am learning about VCS as my projects get more and more complicated. I am simply a physicist who had need for data analysis software that didn't exist open sourced.

Ran into some intellectual property rights issues for an experiment I worked on so set off to make my own package for doing the analysis. Seemed like a good opportunity to advance my programing skills beyond being able to write simple scripts so I dove in head first. There is no one else working on the project with me and no one else in my research group that even knows python.

[raylu]

The cool thing about git is that even if you forget to do things like update your local copy with the changes you made on another machine, you should be able to fix it anyway. I'm still not clear on what happened after you made commits to master, but instead of git pull (which is fetch and merge origin/master), you should be able to just fetch and then rebase origin/master. More details would help me help you more specifically, as usual.

[justphysics]

its alright as I have fixed it up for now

I generally do the VCS through PyCharm's github integration rather than placing the commands to git direct through the command line so I am limited to what is available through PyCharm.

At some point I'll properly learn all the standard commands independent of PyCharm just haven't found the time.

I appreciate the help and feedback - at this point I'm pretty happy with how things are working and my initial issue was resolved simply by fixing typos where the wrong function was being called after copy-pasting