Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge conflicts, etc. #2

Open
kellyrowland opened this issue Dec 2, 2016 · 0 comments
Open

merge conflicts, etc. #2

kellyrowland opened this issue Dec 2, 2016 · 0 comments

Comments

@kellyrowland
Copy link

Hi,

I'm interested in making a change + PR on one of the iPython notebooks, but after cloning the master branch and then pulling the dev branch, I get a merge conflict error. Could this be resolved and pushed to the repo?
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@kellyrowland