Changes between Initial Version and Version 1 of Ticket #68, comment 107
- Timestamp:
- 2016-01-15T19:38:35Z (9 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Ticket #68, comment 107
initial v1 4 4 https://github.com/leif/tahoe-lafs/compare/master...introless-multiintro-squashed 5 5 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```)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``) 7 7 8 8 I'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!