Change could not be merged because of a missing dependency

Gerrit is hard. If you found Git (behind Gerrit) hard to understand and operate, then don’t worry — the real hell is still before you. And one of the biggest Gerrit newbies’ nightmares is situation, when Gerrit is unable to auto-merge particular change, showing “Change could not be merged because of a missing dependency” message. This mostly happens, when you abadon another change, on which current change depends.

Read More “Change could not be merged because of a missing dependency”

Push local repo to a new remote with all branches tags and all the history

Since both me and my boss / admin are kind of newbies to Git and since our both vision on how application structure should look is a way different, we quickly did a quite pretty mess in our main repository and got lost a little bit! :] After some short talk, we agreed on one thing (at least). We need to make a new, clean Git repository and push everything from my local repository to it.

This brought us to a question, how to do this? After a short googling, I found these Stack Overflow questions:

• Cannot push into git repository,
• Push local Git repo to new remote including all branches and tags
• Git push error ‘[remote rejected] master -> master (branch is currently checked out)’,

but none of them gave me a quick-and-dirty answer (or: checklist) on how to do this, without too much read.

So, I decided to write my own. Once again, Git turned out to be much better and much easier than SVN.

Read More “Push local repo to a new remote with all branches tags and all the history”

A quick introduction to Git for former SVN users

I must admit that there were times, when I loved SVN an thought about Git as useless, hard-to-use, piece of crap. Now, I can’t imagine my life without it.

When starting a new job, I found a person with similar thought as my past ones. And I decided to write this simple introduction to try to talk that person into changing his mind.

Read More “A quick introduction to Git for former SVN users”

TortoiseGit asking for password on password-less login setup

After months of uninterrupted password-less work, my TortoiseGit started to ask me for a password on some of my remotes, when pushing / pulling. I’m seeking a solution to fix this, as this can drive me crazy. I haven’t found a good fix so far, so don’t treat this article as an ultimate solution. Nevertheless, you can get a quick check-list out of this text to see, what I’ve managed to find out so far.

Read More “TortoiseGit asking for password on password-less login setup”

Git did not exit cleanly (exit code 128)

Probably the most popular error in TortoiseGit is:

[code lang=text]
git did not exit cleanly (exit code 128)
[/code]

And all, it tells you, is that something was wrong when calling git.exe internally. That’s pretty not much, don’t you think? Well, this StackOverflow question may help you, at least in certain situations. It has 14 answers (from dumbest, like not updating program to newest version) to quite interesting one. This could be a good starting point, before looking somewhere else.

Setting up password-less connection in Git Bash or cmd

All right, we’re after Setting up password-less connection in Netbeans and Setting up password-less connection in TortoiseGit, now it is time to do the same in “pure Windows”, that is: to be able to establish password-less connection with any Git-based repository in command-line (both cmd and Git Bash).

If you were using your repo in Netbeans and/or TortoiseGit painlessly, but each attempt of doing the same in console, ends up with annoying message:

Disconnected. No supported authentication methods available (server sent: publickey)

then you’re in right place to get help.

Read More “Setting up password-less connection in Git Bash or cmd”

Setting up password-less connection in Netbeans

Following Setting up password-less connection with GitHub in TortoiseGit article, here are tips on how to setup password-less connection between your GitHub account and your local repository operated under Netbeans. The easiest way to setup password-less connection, is to do this on initial GitHub repo clone or pulling. And it will be presented this way, in following article.

Read More “Setting up password-less connection in Netbeans”

Setting up password-less connection in TortoiseGit

Both mysysgit and TortoiseGit are password-less in the meaning, that they don’t store any passwords. If you want to avoid typing your GitHub login password and over and over again, the only option is to setup password-less login using SSH keys. This article is my personal check-list on how to configure each computer as painlessly as possible.

Read More “Setting up password-less connection in TortoiseGit”

Dealing with “Non-fast forward updates were rejected” error in Git

If your attempt of pushing local changes in your local working copy of a Git repository to remote server fails with “Non-fast forward updates were rejected”, there are several things you my try to fix it. Here I give you some advises, but read comments around them throughly, as without being sure, what you’re doing, you may do some charm to your local working copy or even remote repository.

Read More “Dealing with “Non-fast forward updates were rejected” error in Git”

Using Netbeans with existing SVN or Git repository

Netbeans is known to not work correctly with existing local working copies of remote repositories for both SVN and Git. Especially, if they were checked out using client other than built-in into Netbeans. For example, Netbeans does not allows to enter login and password (fields grayed) and thus can’t operate on these LWCs.

If you’re experiencing such or similar issues, you’re highly recommended to delete local working copy and checkout it again, using Netbeans internal client. If you have some changes stashed, you should think about committing and pushing them using different client and then delete LWC and checkout it again.

Getting Git to Windows

In my opinion, the best option for former (or concurent) SVN users is to install TortoiseGit. It mimics nearly everything, you had in TortoiseSVN into Git world. Note, that on official TortoiseGit site you’re recommended to install TortoiseGit first, then msysgit. This is conviniend, if you’re Git-only user (details below). If you also use TortoiseSVN, consider installing msysgit first.

Read More “Getting Git to Windows”

Professional Git commit comments

Git commit comments / log messages are (may / should be) more complex than those from Subversion. They can be automatically converted into e-mails sent to other commiters or other kind of group of interest. Some Git commands and tools may generate additional commit messages. That’s why comments written by you manually, should follow some rules and guideline. Most of them are expressed in this article.

Read More “Professional Git commit comments”

Using git-svn under Windows for migrating SVN repo into Git

I wanted to import SVN repository into Git repository, where SVN repo had uncommon structure (without trunk / branches / tags folder). And I wanted to skip all the remote branches stuff, just export entire SVN repository as current master branch in Git repo.

Note, that I used console commands (like git svn) only to do hard job of migration. Other stuff, that I was able to achieve in TortoiseGit (like pushing to remote) I did manually.

Read More “Using git-svn under Windows for migrating SVN repo into Git”

Ignoring files and folders in TortoiseSVN

Ignoring folders using TortoiseSVN is a rather delicate thing. You must consider many factors, such as: whether file is or isn’t already versioned, whether file is needed for running application (i.e. file is junk or differs per computer and you don’t want to put it into repository, but must exist in local folder) etc.

Read More “Ignoring files and folders in TortoiseSVN”

What Agile is NOT?

If you ask Google on what is agile software development you’ll find thousands of results. Let’s then turn the table around and say what agile isn’t.

There’s no agile development, if:

• there is at least one-man team,
• iterations are longer than 4-6 weeks,
• development is not started before the analysis is completed,
• delivered code is not thoroughly tested at the end of each iteration,
• each iteration does not end with the production version of the application,
• progress is measured by lines of code or hours, and not by a delivered results.

And the most important — Agile is not a miracle solution to all your problems! You know:

Agile is not the remedy, the magic cure that will solve all the problems. It will only make them so painfully visible that further ignoring them won’t be possible.

Ken Schwaber, a SCRUM’s co-author