File:Git Foundations - Merge.webm
Jump to navigation
Jump to search
Size of this JPG preview of this WEBM file: 800 × 450 pixels. Other resolutions: 320 × 180 pixels | 640 × 360 pixels | 1,024 × 576 pixels | 1,280 × 720 pixels | 1,920 × 1,080 pixels.
Original file (WebM audio/video file, VP8/Vorbis, length 4 min 28 s, 1,920 × 1,080 pixels, 635 kbps overall, file size: 20.32 MB)
Captions
Captions
Add a one-line explanation of what this file represents
Summary
[edit]| Description |
English: Once you know branches, merging that work into master is the natural next step. Find out how to merge branches, identify and clean up merge conflicts or avoid conflicts until a later date. Lastly, we'll look at combining the merged feature branch into a single commit and cleaning up your feature branch after merges. |
| Date | |
| Source | Vimeo: Merge • GitHub & Git Foundations (view archived source) |
| Author | GitHub |
Licensing
[edit]
This file is licensed under the Creative Commons Attribution 3.0 Unported 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.
|
This file, which was originally posted to
Vimeo: Merge • GitHub & Git Foundations (view archived source), was reviewed on 1 February 2017 by reviewer Rodrigolopes, who confirmed that it was available there under the stated license on that date.
|
File history
Click on a date/time to view the file as it appeared at that time.
| Date/Time | Thumbnail | Dimensions | User | Comment | |
|---|---|---|---|---|---|
| current | 01:51, 30 January 2017 | 4 min 28 s, 1,920 × 1,080 (20.32 MB) | Legoktm (talk | contribs) | Imported media from https://vimeo.com/album/2763106/video/105607731 |
You cannot overwrite this file.
File usage on Commons
The following 3 pages use this file: