How to merge the previous branch to current one using SmartGit

In Smartgit, click Merge, then click branches. Uncheck all. Then check the Origin->Previous sprint – > Merge to Working Tree.

Then see if there is conflicts. If there is one, you can either right click ->Resolve then choose our file or their file. 2nd way is to open conflict by clicking twice on the file, then clicking on the arrow to accept the correct code.

Then Commit->Push

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