Skip to content

Conversation

@smichnowicz
Copy link

2nd Attempt. Fixed some typos. Added another diagram. Ready for live review.

@steveandroulakis
Copy link
Owner

Hi Simon,

I can't merge this because you haven't updated the changes I made to my repository yesterday.

I have already added your yesterday's version of the data processing ipython notebook. So what you've done won't merge properly, leaving your dataprocessing/ folder next to my existing 02-python-data-processing/ one from yesterday.

Could you please fix up these changes using the following steps? This is probably a good lesson on git workflow for you..

  1. In your git repository on your computer: git remote add steve https://github.com/steveandroulakis/intro-python.git
  2. git fetch steve
  3. git checkout --track -b steve_master steve/master (this switches git to my latest updated copy on your computer, git checkout master to get back to yours)
  4. Either manually apply your recent changes to my branch on your local machine, or git merge master to pull your recent changes on top of mine and fix it up (the second one might be harder).

You can always pull the "I can't be bothered learning git workflow right now" card, which is absolutely fine and I'll go through the effort of pulling your changes instead of the pull-request here.

Thanks,
Steve

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants