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

Sync Gtilde speedup #137

Closed
wants to merge 14 commits into from
Closed

Sync Gtilde speedup #137

wants to merge 14 commits into from

Conversation

tibaldo
Copy link
Contributor

@tibaldo tibaldo commented Mar 15, 2017

This simple mod speed up the calculation of synchrotron spectra by 40%. See discussion in #135.

@zblz
Copy link
Owner

zblz commented Mar 15, 2017

Can you rebase on master so that only the last commit (03a4ae4) remains in the PR? The first two are already in master and the merge commit introduces conflicts in travis.yml.

@tibaldo
Copy link
Contributor Author

tibaldo commented Mar 16, 2017

There is a conflict I cannot resolve in any way, I'll start clean with another branch.

@tibaldo tibaldo closed this Mar 16, 2017
@tibaldo tibaldo deleted the SYNC-Gtilde-speedup branch March 16, 2017 00:09
@zblz
Copy link
Owner

zblz commented Mar 16, 2017

I see you created a new PR, but for the record this could have been resolved with git rebase -i origin/master and then dropping the first couple of commits. After rewriting the branch you have to force push to update

@tibaldo
Copy link
Contributor Author

tibaldo commented Mar 16, 2017

I tried to do this, but the rebase was failing due to non-mergeable conflicts in .travis.yaml that I could not figure out how to resolve (although they seemed relatively trivial).
Anyway, sorry for the example of bad practises, but I got frustrated and it was way faster to do the new PR.

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.

None yet

2 participants