There is no direct way to replace the master branch of your git project with the working branch (or any other branch), but with the ‘ours‘ strategy of the GIT, you can achieve this task. This strategy will replace the master branch entirely with the working branch. Lets do this step by step: Checkout the working branch (say working_branch) Merge ... Read More »
Others
git .gitignore not working
If we come across a situation when we feels that the .gitignore file is not working then you are required to run these below commands- git rm -rf --cached . This removes any changed files from the staging area, then run the below command- git add . After running these above commands, now run the commit command and see the ... Read More »
Some useful Regular Expression examples
Some useful Regular Expression examples Regular expression is a special sequence of characters that helps you match/find strings or sets of strings. Basically it defines a search pattern for strings. They can be used to search, edit, or manipulate text and data. The abbreviation for regular expression is regex Below are some useful regex patterns that can be used in ... Read More »
Integration of Android Studio and Git
This tutorial explains how to use Git Version Control with Android Studio. Git is a distributed version control system. Git is a best choice among all the version control software like CVS, SVN etc. Android studio comes with Git client. All we need to do is just enable and start using it. As a prerequisite, we need to have Git ... Read More »
How to kill a process in a shell script that is running through cron
I have a shell script which is running in cronjob. This shell script has start with killing the process if it is already running and start the new process again. To do so I wrote the below line at the beginning of my shell script. First step is to find the PID (Process Id) and once that is found use ... Read More »
Installing Apache Maven on Ubuntu & Windows
To install Apache Maven on Ubuntu and Windows machine we need to take the following steps- Download the current stable version of Maven from http://maven.apache.org/download.cgi. Once downloaded follow the istallation steps – Installation Instructions A. Unix-based Operating Systems (Linux, Solaris and Mac OS X) Extract the distribution archive, i.e. apache-maven-3.2.5-bin.tar.gz to the directory you wish to install Maven 3.2.5. These ... Read More »
Install Node.js on an Ubuntu server
Node.js is a Javascript platform for server-side programming that allows users to build network applications quickly. By leveraging Javascript on both the front-end and the back-end, development can be more consistent and be designed within the same system. Install NodeJs We have to use the apt package manager. We should refresh our local package index prior and then install it ... Read More »
MyEclipse: Runtime Error R6025 “pure virtual function call”
Sometimes while opening some files or during starting we encounter the below mentioned error and our MyEclipse gets crashed – Microsoft Visual C++ Runtime Library Runtime Error! Program: C:\...\jdk-1.6.0\bin\javaw.exe R6025 - pure virtual function call Solution for this problem is – 1) . Open the file workbench.xml in the location C:\…\\workspace\.metadata\.plugins\org.eclipse.ui.workbench\ 2) . Delete all the tag (This contains the ... Read More »