Skip to content
This repository has been archived by the owner on Jul 12, 2020. It is now read-only.

Update 04-exercise-1.md #406

Closed
wants to merge 1 commit into from
Closed

Update 04-exercise-1.md #406

wants to merge 1 commit into from

Conversation

johanneslumpe
Copy link
Contributor

Added window in front of two calls to match the explanation.

@addyosmani
Copy link
Owner

Thanks for the PR. Could you rebase against master?

@johanneslumpe
Copy link
Contributor Author

I'm new to git - not sure how to do this. If you show me, I'll know it for future PRs!

@addyosmani
Copy link
Owner

@johanneslumpe
Copy link
Contributor Author

Ok, tried it very quickly. Got to checkout the branch and also a rebase seemed to work fine. When i tried it a second time git replied "Current branch head is up to date". But I don't know what do to now... Sorry ,that this is taking so long, I will read more tutorials on Git so that I can do this better in the future.

@addyosmani
Copy link
Owner

No worries at all. Thanks for taking the time out! If you need help I'm happy to bring these changes in manually.

@johanneslumpe
Copy link
Contributor Author

Ok I tried a bit more - got as far as to switch the branch properly and do the rebase - but it detects two merge conflicts. So before I break anything it might be better to update this stuff manually - sorry :/

@addyosmani addyosmani closed this in 9a99770 Apr 8, 2013
@johanneslumpe johanneslumpe deleted the patch-1 branch May 15, 2013 15:26
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants