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.

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

Implementing complex-numbers #189

Closed
wants to merge 0 commits into from
Closed

Implementing complex-numbers #189

wants to merge 0 commits into from

Conversation

Average-user
Copy link
Member

.

@haus
Copy link
Contributor

haus commented Oct 24, 2017

This looks good to me. It looks like it needs a rebase to account for some changes to config.json.

@Average-user
Copy link
Member Author

@haus Don't exactly know what you mean with that.

@haus
Copy link
Contributor

haus commented Oct 26, 2017

@Average-user it just means that there were changes made to config.json in other commits that have been merged that git can't resolve automatically (this PR caused the conflict: #193). There are a couple of ways to resolve the conflict:

  1. Try the 'Resolve conflicts' button in the PR screen (https://help.github.com/articles/resolving-a-merge-conflict-on-github/ seems like a good resource)
  2. Try resolving the conflict on the command line (https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ seems like a good resource)

@haus
Copy link
Contributor

haus commented Oct 29, 2017

Hmm. Looks like there are still conflicts. I'll try to pull this down and fix the conflicts.

@haus haus closed this Oct 29, 2017
@haus
Copy link
Contributor

haus commented Oct 29, 2017

Oops. I didn't mean to do that. #195 has the conflicts resolved.

@Average-user
Copy link
Member Author

@haus I was trying something too. But it haven't been working.

@haus
Copy link
Contributor

haus commented Oct 29, 2017

Cool

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