Page history

Jump to navigation Jump to search

Sheriffing/How To/Merge Conflicts

13 January 2026

Archaeopteryx
add how to identify files in merge conflict if lando CLI tool used
10:18
+801

30 April 2018

Archaeopteryx
added example with file deletion
12:06
+3,155

6 April 2018

Archaeopteryx
→‎Example: code added and modified, conflict fixed: explained changed line in more detail
13:26
+108
Archaeopteryx
added: Example: code added and modified, conflict fixed
12:44
+5,478

30 November 2017

Archaeopteryx
no edit summary
22:20
+3

8 November 2017

7 November 2017

Archaeopteryx
explain how to resolve merge conflicts, work in progress (save to not lose progress by accident)
18:18
+3,251

28 July 2017

21 July 2017

ChrisCooper
no edit summary
20:48
−89

13 December 2013

Tomcat
no edit summary
07:10
+9

12 December 2013

Tomcat
no edit summary
14:28
+7

6 November 2013

Tomcat
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..."
15:03
+504

Retrieved from "https://wiki.mozilla.org/Special:History/Sheriffing/How_To/Merge_Conflicts"