| 1 |
On 19 September 2014 06:51, Rich Freeman <rich0@g.o> wrote: |
| 2 |
|
| 3 |
> |
| 4 |
> Git even allows the use of tools like meld to resolve conflicts, |
| 5 |
> besides the usual fill-the-file-with-diffs-to-cleanup approach. |
| 6 |
|
| 7 |
|
| 8 |
I'd personally discourage any kind of collision resolution in the merge |
| 9 |
itself. |
| 10 |
|
| 11 |
Mostly because I've been bitten by attempted rebases where those collision |
| 12 |
resolutions have been *lost* . |
| 13 |
|
| 14 |
Much preferable to rebase one branch or find some otherway to weed the |
| 15 |
collision out prior to merge and giving a clean track record of where the |
| 16 |
fix was applied. ( Because the fix happening in the merge is a great way to |
| 17 |
hide accidental code changes ) |
| 18 |
|
| 19 |
|
| 20 |
-- |
| 21 |
Kent |
| 22 |
|
| 23 |
*KENTNL* - https://metacpan.org/author/KENTNL |
Archives