simon michnowicz. First attempt on "data processing with Python"#1
Open
smichnowicz wants to merge 1 commit intosteveandroulakis:masterfrom
smichnowicz:master
Open
simon michnowicz. First attempt on "data processing with Python"#1smichnowicz wants to merge 1 commit intosteveandroulakis:masterfrom smichnowicz:master
smichnowicz wants to merge 1 commit intosteveandroulakis:masterfrom
smichnowicz:master
Conversation
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..
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, |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
2nd Attempt. Fixed some typos. Added another diagram. Ready for live review.