Skip to content

Refactoring#5

Open
konr wants to merge 10 commits intomasterfrom
refactoring
Open

Refactoring#5
konr wants to merge 10 commits intomasterfrom
refactoring

Conversation

@konr
Copy link
Copy Markdown
Member

@konr konr commented Sep 18, 2014

No description provided.

@nberger
Copy link
Copy Markdown
Contributor

nberger commented Sep 18, 2014

This has diverged from master. As one of the commits says, this is actually a different version, a rewrite... To make it into master, we can first merge master here resolving all conflicts in favor of this branch. I think it would be great to continue working on master as soon as possible.

What do you guys think? @konr?

@konr
Copy link
Copy Markdown
Member Author

konr commented Sep 18, 2014

agreed, @nberger! Perhaps after finishing this set we can look back and clean up the code.

@nberger
Copy link
Copy Markdown
Contributor

nberger commented Sep 23, 2014

#6 should fix the conflicts that prevent this to be merged. Once #6 is merged, we can decide if we do a rebase before merging...

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.

4 participants