Git Programming Languages

How to Resolve Conflicts in Files and Push the code to Git

If you are facing some conflict issues in some file(s) during commit or merge then you can follow the below procedure to resolve conflicts. You don’t need mergetool for this. It can be resolved pretty easily manually. WinMerge is pretty good tool to resolve these kinds of conflict issues.

1. First see and identify which files are in conflict by using git status command.
2. Open each file in text editor and examine the difference and resolve them by removing the code that you don’t need. You may need to discuss it with fellow developers/designers who committed the code.
3. Once you’ve resolved the conflict in a file then use git add file_name_with_complete_path.
4. Once you’ve resolved all conflicts then use the command git commit -a -m “resolved conflict in files”
5. Now use the command git push origin YourBranchName to push your changes to Git repository.

Blogging Open Sources PHP Search Engine Optimization WebSites Wordpress

Top 10 Benefits Of Using WordPress For Your Website/Blog

WordPress is gaining in popularity now a days and 72,753,709 websites are running on WordPress. You can check the stats at

Top 10 Benefits Of Using WordPress For Your Website

One of the other benefits of using WordPress for your website of course, is that you have a website and a blog all in one. And a blog is a great way to build traffic to your website. Regularly publishing quality articles and content to your website/blog gives Google more content to crawl, and provides value to your web site visitors as well. When using WordPress for your website, you can set up a static front page that doesn’t look like a blog at all, and then have a link to an “articles” area on your site, where you can publish content rich articles.
You all must heard about the Open Source Platform WordPress. WordPress has been around since 2003 and is the most popular blogging software on the market. Over the last few years, WordPress has also become the content management software of choice for non-blogging websites. Here are the top 10 reasons why WordPress is so popular and why you might want to consider switching to a WordPress platform for your company’s website.

1. Easy to Use and User Friendly – If you can use Microsoft Word and Facebook then WordPress will be very easy for you. Tasks such as adding new pages/posts, images and video are now easy for everyone.

2. Update Your Website From Anywhere – WordPress runs in your web browser. So from any computer with Internet access (at home, at the office, on a business trip, etc) you can log in and update your website. Even from your smartphone.

3. Take Control of Your Site and Do Everything Yourself – After your website is built and live, you can update it yourself by adding content from backend. This way you will get a dynamic content website at a cost of static website. No more waiting for a web designer or programmer to upload the static pages and content on your website. With WordPress you enter the Do-It-Yourself world.

4. Free Search Engines Optimization – The coding and structure of WordPress is great for search engines. WordPress URL are more SEO friendly. That means your site is more likely to land on the first page of Google results, which means people are more likely to find you. Now you don’t need to hire a company for SEO of your website to get strong rankings.

5. Multiple Users from Many Places – WordPress is online and offers multiple users, which means you’re not the only one who can fix something in a pinch and you can access it from anywhere. If your company/business has several people who need to update your website (such as different blog authors) you can easily create individual accounts for each user. And each user can be assigned different access levels. So you can limit access to advanced features that you want to reserve only for your IT staff, etc.

6. Cheap or Almost Free – This is one of the most common but important feature of using WordPress for developing your website. Using WordPress for your website means it’s cost effective. WordPress itself is free, a theme is easily under $100 or even free and you save loads of money (compare the cost of template vs custom design).

7. Massive choice of themes – WordPress comes with two default themes (themes control the look and feel of your site) already installed which are quite basic. Despite of these themes you can search, upload & install themes from your WordPress dashboard. This way you can change your website design in less than 5 minutes. There are thousands of free themes available. You can also go further and install premium themes which typically sell for anywhere between $50 and $150.

8. Extensibility with thousands of plug ins – There are nearly 8,000 plugins available that you can install to enhance the usability and functionality of WordPress. Again these are easily searched, installed & activated via your dashboard. Some popular plug in additions, improve seo, enhance blog comment functions, page orders, twitter tools, XML sitemap creators, pinging, rotating tag clouds… the list is endless.

9. Automatic updating to keep you safe from Hacking – WordPress announces latest updated and release. These updates can be seen at your dashboard. You will need to upgrade them from time to time and this all can be done by more or less one click of your mouse. It is important to back up regularly and often. Keeping WordPress up to date with the latest release is the best way to keep it secure. There are enhancements you can install via plug ins for added peace of mind such as

10. Best Blogging Platform – If you are vivid blogger and you want to write articles on your websites then this is the best online blogging software/application for you. Its SEO friendly nature makes your website searchable on all major search engines so that you can get more advantages without any expense on SEO. However with the installation of one plug in “All In One SEO Plug In” the site will be fully optimized, taking away the mystery of SEO which is so often made to look so much more complicated than it actually is.

Google Google Maps MySql PHP phpMyAdmin Programming Languages

How to store Longitude/Latitude, from Google Maps in MySql?

If you are confused about the field type of longitude/latitude in the database tables and you are thinking about decimal or float then use the best way defined below.

In MySQL or SQL Server, we can save it as FLOAT( 10, 6 ) NOT NULL

This is the recommendation from google itself:

CREATE TABLE `markers` (
`name` VARCHAR( 60 ) NOT NULL ,
`address` VARCHAR( 80 ) NOT NULL ,
`lat` FLOAT( 10, 6 ) NOT NULL ,
`lng` FLOAT( 10, 6 ) NOT NULL ,
`type` VARCHAR( 30 ) NOT NULL

If you are using phpmyadmin then you can save the latitude and longitude shown below.

Git Linux Server PHP

Basic Git commands and use of these commands

Once you have installed git on your local computer then you have to go to the folder where git is installed.
To go to the folder you can write the following
cd c:/xampp/htdocs/
git branch

If you are using Git Public Repository then you must be aware about the following basic commands of Git.
Here is a small list of basic Git commands.

git push origin :BN – remove/delete branch from git server/repository

git stash – if there are conflicts and you want to avoid those conflicts

(git add filename) in which u resolved conflict then (git commit -a -m “resolved conflict while making design changes by nilesh”) then git push origin Dev and see your changes

git merge commit_id (to commit the changes in the branch that you are in now)

git reset – -hard (Reset current HEAD to the specified state)

git reset – -hard origin/master (if you are in master branch and git pull showing some conflicts then you can use this command to reset the master)

git branch -D BN – to delete a branch (you must be in other branch(i.e master or IndexFlowVaseem) to delete this branch)

git fetch origin BN:BN – to pull branch data from git

pwd – to see current working directory

git branch MyNewBranch – to create a new branch

git checkout master – to work in master branch or to switch master branch

git pull origin branchname – to get the data on your local computer or git pull origin Dev

git pull origin Dev – a new branch named as Dev will be created with the code from git

git status – to see the changes in your branch and in branch

git commit filepath_name1 filepath_name2 -m “your comment” – to commit the changes you have made

git push origin MyBranch – to upload your data to git branch

git add filename1 filename2 – to add new files in git

git log – to see the commit in the current branch

rm filename1 filename2 – to delete files

The most commonly used git commands are:
add–Add file contents to the index
bisect–Find by binary search the change that introduced a bug
branch–List, create, or delete branches
checkout–Checkout a branch or paths to the working tree
clone–Clone a repository into a new directory
commit–Record changes to the repository
diff–Show changes between commits, commit and working tree, etc
grep–Print lines matching a pattern
init–Create an empty git repository or reinitialize an existing one
log–Show commit logs
merge–Join two or more development histories together
mv–Move or rename a file, a directory, or a symlink
pull–Fetch from and merge with another repository or a local branch
push–Update remote refs along with associated objects
rebase–Forward-port local commits to the updated upstream head
rm–Remove files from the working tree and from the index
show–Show various types of objects
tag–Create, list, delete or verify a tag object signed with GPG

Git Programming Languages

How to get Git Commit Id

If you are a programmer or developer then you must heard about the Git.
Git is a free & open source, distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

You must If you are working with Git and you want to make changes in the code. Then after making those changes you will need a commit id to make those changes Live.

Please follow the following procedure to get a Git commit id.

cd /c/xampp/xampp/htdocs/lazy-load-release/
git checkout master    (to go to master branch)
git pull origin master (this will copy all the data from git to your computer)
git branch NewBranch (this will create a new branch with data of master branch)
git checkout NewBranch (To switch to your branch and then Put your files or work in lazy-load-release(name of folder may be differ) folder)
git status (you will see the list fo files that just been changed)
git commit filename1 filename1 -m “author_commit”
git push origin NewBranch (if you are in the same branch NewBranch) or git push origin NewBranch:NewBranch (if you are not in the same branch)
git log (copy the commit id)

Programming Languages

Which Laptop I Should Buy And Why ?

Acer Aspire – 4750z

Processor Type Intel Pentium Dual Core B940-2.0Ghz
Cache 1 MB
System Memory 2 GB DDR3
HDD Capacity 500 GB
Screen Size 14 Inch
Resolution 1366 x 768 Pixel
Web Camera Acer Crystal Eye webcam + Mic
Price: Rs.21,250

Lenovo G470 – 301887

Processor Type 2nd Generation Pentium Dual Core
Cache 2 MB
System Memory 2 GB DDR3
HDD Capacity 500 GB
Screen Size 14 Inch
Resolution 1366 x 768 Pixel
Web Camera 0.3 Megapixel
Price: Rs.23,100

Lenovo G570-301881

Processor Type 2nd Generation Pentium Dual Core
Cache 2 MB
System Memory 2 GB DDR3
HDD Capacity 500 GB
Screen Size 15.6 Inch
Resolution 1366 x 768 Pixel
Web Camera 0.3 Megapixel
Price: Rs.23,100

Lenovo G560 – 304299

Processor Type Core i3 – 2.13GHz
Cache – 3 MB
System Memory 2 GB DDR3
HDD Capacity 500 GB
Screen Size 15.6 Inches
Resolution – 1366 X 768 Pixels
Web Camera Integrated 1.3MP / 0.3MP webcam
Price: Rs.24,600