Merge branch 'master' of https://github.com/JuliaFEM/JuliaFEM.jl

2026-09-17 01:02:13 +00:00 · 2015-11-06 12:07:50 +02:00
parent 83590ea9c3 732dfed6e3
commit 6df79d7cdd
2 changed files with 178 additions and 82 deletions
@@ -78,6 +78,16 @@ Testing is made easy by using our `Makefile`. From there one founds convenient
 functions `make test`, `make test_file` and `make test_function` to make testing
 more rapid.

+Git issues
+----------
+
+Have done local changes, want to get latest updates and get "Cannot pull with
+rebase: You have unstaged changes. Please commit or stash them."
+
+http://stackoverflow.com/questions/23517464/error-cannot-pull-with-rebase-you-have-unstaged-changes
+
+Solution: git stash + git pull + git pop
+
 Use of UTF-8 characters in program code
 ---------------------------------------
 We have decided not to use them. See issue