Skip to content

Conversation

michaek
Copy link

@michaek michaek commented Dec 23, 2011

Sorry for the confusion with this pull request. I didn't really have the flow down before I got started, and hopefully this commit does the trick!

See: #873

@jpmckinney
Copy link
Contributor

Can you rebase against master so that this can be automatically merged? Thanks!

@seanlinsley
Copy link
Contributor

Please rebase these changes on master:

# Expectations: "upstream" is gregbell's GitHub repo and "origin" is your fork

# Rebase your fork's master branch with the latest upstream changes
git checkout master
git pull --rebase upstream master
git push origin master

# Rebase your feature branch with the latest upstream changes
git checkout your_feature_branch
git pull --rebase upstream master
git push origin your_feature_branch # note that you may need to use -f

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.

3 participants