Squashing the merges

-


When you want to merge into master, sometimes you want to squash all your commits (for that branch), so that they appear as a single commit on master.
You will always go into master and pull the changes from the branch.
Here are the git commands for you to do it.
Say your bug fix branch is called fixedAllBugs and you want to merge it into master:
git checkout master
git merge --squash fixedAllBugs
git commit

Comments

Post a Comment

Popular posts from this blog

The pesky scrollbars on Remote desktop - Finally fixed!!

-
Image
  The problem We always had scrollbars (vertical as well as horizontal) when we connect to remote desktop (eg: nftRunbox01). This meant we had to scroll up and down many times to work on rotheram environments.  Full screen was an option, but we wanted to see the taskbar as well as the messages from skype (Paul). I remember my colleagues would not allow pairing unless the scroll bar issue was fixed. :)  We ended up editing rdp files and what we tried to do was... desktopwidth:i:1437 desktopheight:i:865 session bpp:i:24 winposstr:s:0,1,0,20,1437,865 We changed the winposstr values so that horizontal and vertical scroll bars disappear. This was a trial and error method and consumed a lot of time (10 to 15 mts). I looked at a few open source projects and found a project on sourceforge which solved the problem. I was still looking for a way (easier) to solve the scroll bar issue. Solution Just add the following line to your .rdp file. smart sizing:i:1 Old RDP File desktopwidth:i:1437 de
Read more

Exploring RedCritter - website for Agile project mangement

-
I found redcritter as one of the apps under microsoft webmatrix. Searching for this software revealed on its own terms "RedCritter Tracker is ideal for software projects or other projects that require a "what's next" type of approach. It works for multiple teams or even individuals. RedCritter Tracker is the only project management service with badges, rewards, leaderboards and real-time Twitter-style feeds" Webmatrix gives me an option to publish it from my local computer. The second option is to publish it from the cloud. The local setup The installation was a breeze. I am creating my first account. Email: manoj.tharayil@gmail.com Username in gmail. Uploading to an azure website, does not seem to be complicated. The azure website was created easily. http://manojagile.azurewebsites.net/ This software gives me rights to add only three users in the free version. This is nota good idea!! Time to move on to something else!!
Read more

API Testing with Rest Assured - Validating the json schema

-
Image
Sometimes you would get a json response while testing web applications. To make sure that all fields are present, but at the same time keeping the tests generic, you might write something like this given below.(although, a newbie way of writing tests)  @Category(RegressionTests.class)     @Test     public void verifyResponseByValidatingPresenceOfAllFields() {         given().                 param("product", "HomeLoan").                 param("fromHomeLoanId", -100).         when().                 get("/loans").         then().                 statusCode(200).                 contentType(ContentType.JSON).                 body(containsString("loans")).                 body(containsString("loanId")).                 body(containsString("businessId")).                 body(containsString("country")).                 body(containsString("statements")).                 body(contai
Read more