Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "File:Git merge conflict.png"
(Screenshot I took of Eclipse Merge conflict. I hereby publish under EPL license. Related to finding conflicting files in article: https://wiki.eclipse.org/index.php?title=EGit/User_Guide) |
(Lufimtse.redhat.com uploaded a new version of "File:Git merge conflict.png": shrank) |
(No difference)
| |
Latest revision as of 12:31, 22 August 2014
Screenshot I took of Eclipse Merge conflict. I hereby publish under EPL license.
Related to finding conflicting files in article: https://wiki.eclipse.org/index.php?title=EGit/User_Guide
File history
Click on a date/time to view the file as it appeared at that time.
| Date/Time | Thumbnail | Dimensions | User | Comment | |
|---|---|---|---|---|---|
| current | 12:31, 22 August 2014 |  | 846 × 323 (77 KB) | Lufimtse.redhat.com (Talk | contribs) | shrank |
| 12:22, 22 August 2014 |  | 1,114 × 427 (58 KB) | Lufimtse.redhat.com (Talk | contribs) | Screenshot I took of Eclipse Merge conflict. I hereby publish under EPL license. Related to finding conflicting files in article: https://wiki.eclipse.org/index.php?title=EGit/User_Guide |
- You cannot overwrite this file.
File usage
The following page links to this file:
