When does Git merge

Git unlike SVN or CVS, was not auto merging when doing “git pull”. I couldn’t understand why it was not doing it, also I was too lazy to look into Git documentation to find out the reason. Somehow I found out that after doing “git commit” and then doing “git pull” made Git to auto merge.

Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s

%d bloggers like this: