Sheriffing/How To/Merge Conflicts: Difference between revisions

Sheriffing/How To/Merge Conflicts (view source)

7 bytes added , 12 December 2013

no edit summary

Confirmed users

2,317

edits

Revision as of 15:03, 6 November 2013 (view source) Tomcat (talk \| contribs) (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...")		Revision as of 14:28, 12 December 2013 (view source) Tomcat (talk \| contribs) No edit summary Newer edit →
Line 5:		Line 5:
	Resolving Merge Conflicts by others than the inital Developers can cause Problems, so Sheriffs try not to resolve Merge conflicts when the change is not trivial for Sheriffs. In this case we backout the changeset causing the Merge.		Resolving Merge Conflicts by others than the inital Developers can cause Problems, so Sheriffs try not to resolve Merge conflicts when the change is not trivial for Sheriffs. In this case we backout the changeset causing the Merge.

	However on the discretion of the individual Sheriff and available time a Sheriff might be able to resolve also more complicated merge ~~conflict~~. In this case this on a volunteer base and not general :)		However on the discretion of the individual Sheriff and available time, a Sheriff might be able to resolve also more complicated merge conflicts. In this case this on a volunteer base and not general rule :)