File:159 PM Conflict Resolution 2.png

Size of this preview: 800 × 428 pixels. Other resolutions: 320 × 171 pixels | 640 × 343 pixels | 1,024 × 548 pixels | 1,280 × 685 pixels | 2,000 × 1,071 pixels.

Original file ‎(2,000 × 1,071 pixels, file size: 105 KB, MIME type: image/png)

Summary edit

Description	how to resolve conflicts
Source	Self
Date	12 March 2008
Author	Franz Kies
Permission (Reusing this file)	GDFL

Licensing edit

I, the copyright holder of this work, hereby publish it under the following license:

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.

This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 License.

This licensing tag was added to this file as part of the GFDL licensing update.

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:13, 12 March 2008		2,000 × 1,071 (105 KB)	Franz Kies (discuss \| contribs)	how to resolve conflicts

You cannot overwrite this file.

File usage

The following page uses this file:

Project management/Conflict resolution 2