Simple automatic merge
$ git checkout master
- Merge the feature into master.
$ git merge featurex
Merge made by the 'recursive' strategy.
A.txt | 1 +
1 file changed, 1 insertion(+)
$ gitk --all
Press ← or → to navigate between chapters
Press S or / to search in the book
Press ? to show this help
Press Esc to hide this help
$ git checkout master
$ git merge featurex
Merge made by the 'recursive' strategy.
A.txt | 1 +
1 file changed, 1 insertion(+)
$ gitk --all