plaes.org

Suppose you have just committed something in your local repository and now want to push it to the projects master tree. So you give the push command but the result is following :(

 ! [rejected]        master -> master (non-fast forward)

For a while, the easiest solution what I used was to just delete the repository and clone it again. (I was able to do this is easily when I occasionaly push translation updates for GNOME projects.) But eventually I ran into this problem also with my other code projects, so I needed a better solution.

Now, lets assume you have just accidentally committed into your master branch.

git checkout -b bad-master
git branch -D master
git checkout -b master --track origin/master

Vóila - you are back in action :)

I went through my local sympy branches and cleaned up some smaller fixes in order to submit them upstream. I did not push the PDE stuff yet, as I feel it needs some more testing. So only four patches this time:

Added corner case for Bernoulli equation.
Small cleanups to the ODE solver and tests.
Fix typo: s/trascendental/transcendental
Fix path to aboutus.txt url.

And also a small note to myself how to publish and delete remote branch:

git push server local_branch:remote_branch
git push server :remote_branch

Yesterday I bit the bullet and managed to add a simple solver for the separable variables PDE case into Sympy.

I have also set up a git repository viewer and my two patches can be viewed on the pde-upstream branch.