Description:
After finishing work on a branch we need to merge it to the original project or with another branch
Solution:
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
