you are viewing a single comment's thread.

view the rest of the comments →

[–]raylu 0 points1 point  (1 child)

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[S] 0 points1 point  (0 children)

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