In some places you wrote that you simply experienced untracked variations, and in some you experienced unstaged changes. They are two various things and should be taken care of in a different way.Sometimes - but only very hardly ever - rather than a fresh ArrayList, you might want a new LinkedList.