Changes between Version 1 and Version 2 of Ticket #68, comment 107


Ignore:
Timestamp:
2016-01-15T19:39:01Z (8 years ago)
Author:
daira
Comment:

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #68, comment 107

    v1 v2  
    44https://github.com/leif/tahoe-lafs/compare/master...introless-multiintro-squashed
    55
    6 And here is a 3-way merge combining the history of both feature branches with master in such a way that ``git log`` and ``git blame`` can still find the original commits: https://github.com/leif/tahoe-lafs/compare/master...introless-multiintro-with-history (creating this was a git adventure; I ended up doing the 3-way merge using ``-s ours`` and then doing another squash merge followed by ``git commit --amend``)
     6And here is a 3-way merge combining the history of both feature branches with master in such a way that `git log` and `git blame` can still find the original commits: https://github.com/leif/tahoe-lafs/compare/master...introless-multiintro-with-history (creating this was a git adventure; I ended up doing the 3-way merge using `-s ours` and then doing another squash merge followed by `git commit --amend`)
    77
    88I'm going to write more tests before submitting a pull request with one of these. But, if anyone wants to review or test it now I'd appreciate it!