2015:how_to_merge
Differences
This shows you the differences between two versions of the page.
| Next revision | Previous revision | ||
| 2015:how_to_merge [2014/11/06 13:08] – created jonjagger | 2015:how_to_merge [2016/06/11 14:05] (current) – external edit 127.0.0.1 | ||
|---|---|---|---|
| Line 10: | Line 10: | ||
| But having more branches means that we need to merge more often and now we are faced with the prospect of resolving merge conflicts on a more frequent basis.\\ | But having more branches means that we need to merge more often and now we are faced with the prospect of resolving merge conflicts on a more frequent basis.\\ | ||
| \\ | \\ | ||
| - | Some developers, even those very experienced with a single window of code, seem to lose their nerve when faced with side-by-side diffs, 3-way merges and other complex visualisations of a “simple” merge. | + | Some developers, even those very experienced with a single window of code, seem to lose their nerve when faced with side-by-side diffs, 3-way merges and other complex visualisations of a 'simple' |
| The session aims to explore best practices for merging.\\ | The session aims to explore best practices for merging.\\ | ||
| Line 16: | Line 16: | ||
| * Who should be merging | * Who should be merging | ||
| * What an ideal merge should achieve | * What an ideal merge should achieve | ||
| - | * Conflict markers | + | * Conflict markers |
| - | * Using a merge tool — the assisted merge | + | * Using a merge tool - the assisted merge |
| - | * Breaking the rules — when a merge isn’t intended to retain all changes for all sides | + | * Breaking the rules - when a merge isn't intended to retain all changes for all sides |
| We will be using Git for our examples but much of the information will be applicable to other source control systems, even legacy centralised systems.\\ | We will be using Git for our examples but much of the information will be applicable to other source control systems, even legacy centralised systems.\\ | ||
2015/how_to_merge.1415279329.txt.gz · Last modified: 2016/06/11 14:05 (external edit)