Today I survived a shocking experience.  I’m working on an open source framework. Some of the features I’ve been doing at home on a cloned git respository. I have commited about 6 times for a feature. Another change of the feature I was doing on another machine at my workplace. These changes were another two commits. I then patched the two commits I did on my work computer and applied them at home upon the other six commits with gitextensions (version 2.24).

When I applied the patches gitextensions was hanging indefinitely in the patch apply mode. After waiting for about 5 minutes I aborted the patching process. This left my whole repository in the middle of rebase state. Worst of all was that all my commits from the last week where gone! My blood pressure raised immediately. I tried several approaches: Abort the merge process several times, skip the patches etc. but none of these approaches were successful. Git always complaint that the folder .git/rebase-apply could not be removed. How can this state be resolved? I’ll show you how!

Announcement, Software apply patch, Git, gitextensions

I’m heavily experimenting with git using github.com. Just in case you’ll ever receive the following error message:

failed to push some refs

Don’t panic as I did! Just need to make a pull request first because there might be changes that we need to pull in. Afterwards it is easy possible to push your changes to github.com. Have fun!

Announcement Failed, Git, GitHub, Push