Euler fortran #411
Merged
Euler fortran #411
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
leios
added
Implementation
|
This is how I would do it, assuming that you have git fetch --all
git checkout euler_fortran
git rebase -i upstream/masterThis allows you to do an interactive rebase of your branch on top of the current master, so you can change anything in your history. The option I would take is to rewrite the commit message of the first commit to make sense, then "fixup" all other later commits into that one. It squashes everything but discards commit messages. Compare this to when we hit "Squash and merge" on GitHub, which will pack everything into a single commit just fine, but keep all the nonsense commit messages. |
|
I think this is a good PR. Quick question about the |
leios
approved these changes
Oct 3, 2018
kenpower
pushed a commit
to kenpower/algorithm-archive
that referenced
this pull request
Oct 22, 2018
* Delete monte_carlo_pi.f90 * init * further implementation * next * forward euler implementation * revoked merge changed from bubble.f90 * Gitbook documentation * fix fortran highlight
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hey all!
Another Fortran implementation done.
Compiled without erros with
gcc-Version 8.2.1 20180831 (GCC)usinggfortran -Og -Wall -Werror -std=f95 -fimplicit-none euler.f90 -o euler.Something odd with my git again. The merge history is shown. Any idea how to resolve this even though it does not collide with AAA's master branch?
Regards
depate