Git Automatic Merging

Download Git for free

Example

When the commits on two branches don't conflict, Git can automatically merge them:

~/Stack Overflow(branch:master) » git merge another_branch
Auto-merging file_a
Merge made by the 'recursive' strategy.
 file_a | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Finding all branches with no merged changes