"union" merge demo
This is a simple demonstration of the
union merge driver for maintaining
NEWS file to which entries are added by different contributors.
The scenario consists of two branches
b branched off
where one line is added to the
An attempt is made to merge both changes back to
demo_failing.shshows the behavior of the default
textmerge driver in presence of conflicting changes.
demo_succeed_git.shspecifies that the
NEWSfile should be merged using the
unionmerge driver by adding a corresponding entry to
The first example fails by leaving a merge conflict to be resolved by the user.
The second example succeeds: The
NEWS file contains two new entries from the
branches merged back to
In the third example, GitHub pull requests are merged via
hub merge PULLREQ_URL.
This also works without conflicts, in contrast to the "Merge" button on GitHub
which will be disabled when trying to merge the second pull request.