File:Criss-cross-merge-fix.svg
From Wikipedia the free encyclopedia
Size of this PNG preview of this SVG file: 487 × 600 pixels. Other resolutions: 195 × 240 pixels | 390 × 480 pixels | 624 × 768 pixels | 832 × 1,024 pixels | 1,663 × 2,048 pixels | 921 × 1,134 pixels.
Original file (SVG file, nominally 921 × 1,134 pixels, file size: 16 KB)
 | This is a file from the Wikimedia Commons. Information from its description page there is shown below. Commons is a freely licensed media file repository. You can help. |
Summary
| Description | English: This combines the criss-cross-merge example (from Bram Cohen's letter, cited in the article merge (version control)) with the method of dealing with it. Change of notation clarifies the meaning. |
| Date | |
| Source | https://en.wikipedia.org/wiki/Merge_(version_control)#/media/File:Criss-cross-merge.svg |
| Author | User Xkucf03 (Widipedia/CC) |
| Permission (Reusing this file) | https://en.wikipedia.org/wiki/Merge_(version_control)#/media/File:Criss-cross-merge.svg |
#/media/File:Criss-cross-merge.svg){kind=link}
Licensing
This file is licensed under the Creative Commons Attribution-Share Alike 4.0 International license.
- You are free:
- to share – to copy, distribute and transmit the work
- to remix – to adapt the work
- Under the following conditions:
- attribution – You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
- share alike – If you remix, transform, or build upon the material, you must distribute your contributions under the same or compatible license as the original.
File history
Click on a date/time to view the file as it appeared at that time.
| Date/Time | Thumbnail | Dimensions | User | Comment | |
|---|---|---|---|---|---|
| current | 14:42, 30 June 2016 | | 921 × 1,134 (16 KB) | Akurn | {{subst:Upload marker added by en.wp UW}} {{Information |Description = {{en|This combines the criss-cross-merge example (from Bram Cohen's letter, cited in the article merge (version control)) with the method of dealing... |
File usage
The following pages on the English Wikipedia use this file (pages on other projects are not listed):
Global file usage
The following other wikis use this file:
- Usage on zh.wikipedia.org
