GIT Merge branches


After finishing work on a branch we need to merge it to the original project or with another branch


Checkout and pull main branch. Second, checkout the working branch.

Run the merge command on the working branch:

> git merge –no-ff <Branchname>

If there are conflicts, solve them and commit:

> git status

> git add <filename>

> git commit

> git push

About admin

Just another php developer trying to give something back to the community.
This entry was posted in Tools, Version control and tagged , . Bookmark the permalink.

Leave a Reply

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

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

Google photo

You are commenting using your Google 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 )

Connecting to %s