git reset --soft HEAD^

git reset

Run the above 2 commands and you will have your uncommitted files back. After that you can switch to the right branch and commit them again.

We have 2 parallel branches – ‘master’ and ‘develop’. All development occurs on the ‘develop’ branch. You can create new branches from the ‘develop’ branch and then merge them back to ‘develop’ once a feature is ready.

When it’s time to deploy a feature, we create a new ‘release-x.x’ (x.x = version) branch from the ‘develop’ branch. We can test this release branch, fix bugs and other small changes to make it ready for release. Once we are certain this branch is ready for release, we merge it with ‘develop’ and also ‘master’. We then tag this commit in master and deploy the ‘master’ to production.

Example git commands:

git checkout develop
git checkout -b release-0.1 develop
git checkout develop
git merge –no-ff release-0.1 develop
git checkout master
git merge –no-ff release-0.1 master
git tag “0.1″
git branch -d release-0.1

Now, if there are bug fixes that need to go into production quickly, we create a new ‘hotfix-x.x’ branch from ‘master’. After fixing the bug, we merge ‘hotfix-x.x’ to ‘master’ and also ‘develop’. We then tag this release in ‘master’ and deploy the ‘master’ to production.

Example git commands:

git checkout master
git checkout -b hotfix-0.1.1 master
git checkout develop
git merge –no-ff hotfix-0.1.1 develop
git checkout master
git merge –no-ff hotfix-0.1.1 master
git tag “0.1.1″
git branch -d hotfix-0.1.1

I searched a bit and realized there was an easier (and I’m hoping it’s more efficient) way to reduce the size of a list.

//templist has 70000 objects in it

tempList.subList(15000 – 1, tempList.size()-1).clear();

//templist now has the first 15000 objects in it

//15000 – 1 because the positions start from 0

 

There might be other ways of doing it but this is how I’ve done it :

List list = new ArrayList();

for(Key key : <iterate-over-list-of-keys>){

list.add(persistenceManager.newObjectIdInstance(<class-name-here>, key));

}

Collection objects = persistenceManager.getObjectsById(list);

Hopefully this helps you use the getObjectsById method in JDO on google appengine.

The first time I used the internet on my laptop in Chile, Google Chrome prompted me if I had changed to a different location. Unaware that clicking yes would make the default search bar use Google Chile, I clicked yes!

After a few searches I realized it was easy changing the chrome google search country back to my own country.

Here’s how you change the country specific google search to the one you want :

1. Close Google Chrome
2. Navigate to \Users\\AppData\Local\Google\Chrome\User Data
3. There will be a file named “Local State”
4. Search for “last_known_google_url” and/or “last_prompted_google_url” and change the extension of the value here to the one you want.
5. Start Google Chrome

You should now have the Google search engine in Chrome belonging to the country that you want. Chrome will prompt you again to use Google specific to your location, just select No!

I came across this json string which I had to convert into a Map. Here’s how you do it:

Type type =

 new TypeToken<Map<String, String>>(){}.getType();

Map<String, String> map =

 gson.fromJson("{'key1':'123','key2':'456'}", type);

Hope that helps you convert a json string into a java Map.

Cookie[] cookies = servletRequest.getCookies();

if (cookies != null) {
 for (Cookie cookie : cookies) {
   if (cookie.getName().equals("cookieName")) {
     //do something

     //value can be retrieved using #cookie.getValue()

    }

  }

}

I recently had to delete a remote git branch. After some search found that the command to do this is :

git push origin :branch-name

Of course, you would still need to delete your local git branch using

git branch -d branch-name

Update April, 2011: You can also delete a remote branch in Git using the command below:

git branch -d -r origin/branch-name

java.lang.Enum = com.opensymphony.xwork2.util.EnumTypeConverter

<s:if test=’#role.toString()!=”PAID”‘></s:if>

Hope this helps out someone. What I’m doing is getting the string representation of the enum and comparing the same. I did not know we could do a toString() here, hence thought of blogging about it!