Sheriffing/How To/Merge Conflicts: Revision history

30 April 2018

• curprev 12:0612:06, 30 April 2018‎ Archaeopteryx talk contribs‎ 14,467 bytes +3,155‎ added example with file deletion

6 April 2018

• curprev 13:2613:26, 6 April 2018‎ Archaeopteryx talk contribs‎ 11,312 bytes +108‎ →‎Example: code added and modified, conflict fixed: explained changed line in more detail
• curprev 12:4412:44, 6 April 2018‎ Archaeopteryx talk contribs‎ 11,204 bytes +5,478‎ added: Example: code added and modified, conflict fixed

30 November 2017

• curprev 22:2022:20, 30 November 2017‎ Archaeopteryx talk contribs‎ 5,726 bytes +3‎ No edit summary

8 November 2017

• curprev 14:0614:06, 8 November 2017‎ Archaeopteryx talk contribs‎ 5,723 bytes +827‎ First final version of example
• curprev 13:4613:46, 8 November 2017‎ Archaeopteryx talk contribs‎ 4,896 bytes +1,176‎ save progress

7 November 2017

• curprev 18:1818:18, 7 November 2017‎ Archaeopteryx talk contribs‎ 3,720 bytes +3,251‎ explain how to resolve merge conflicts, work in progress (save to not lose progress by accident)

28 July 2017

• curprev 17:0817:08, 28 July 2017‎ ChrisCooper talk contribs‎ m 469 bytes 0‎ ChrisCooper moved page Sheriffing/How:To:Merge Conflicts to Sheriffing/How To/Merge Conflicts: More intuitive naming scheme
• curprev 17:0717:07, 28 July 2017‎ ChrisCooper talk contribs‎ 469 bytes +38‎ No edit summary

21 July 2017

• curprev 20:4820:48, 21 July 2017‎ ChrisCooper talk contribs‎ 431 bytes −89‎ No edit summary

13 December 2013

• curprev 07:1007:10, 13 December 2013‎ Tomcat talk contribs‎ 520 bytes +9‎ No edit summary

12 December 2013

• curprev 14:2814:28, 12 December 2013‎ Tomcat talk contribs‎ 511 bytes +7‎ No edit summary

6 November 2013

• curprev 15:0315:03, 6 November 2013‎ Tomcat talk contribs‎ 504 bytes +504‎ Created page with " In some cases during Merges Sheriffs might run into Merge Conflicts Resolving Merge Conflicts by others than the inital Developers can cause Problems, so Sheriffs try not t..."