Getting Your Pull Accepted - История изменений

imported>SpaceManiac: Remove "Game Resources" category

2020-12-04T03:40:07Z

Remove "Game Resources" category

← Предыдущая версия		Версия от 03:40, 4 декабря 2020
(нет различий)

imported>SpaceManiac: Remove "Game Resources" category

2020-12-04T03:40:07Z

Remove "Game Resources" category

← Предыдущая версия		Версия от 03:40, 4 декабря 2020
Строка 76:		Строка 76:

	{{Contribution guides}}		{{Contribution guides}}
	~~[[Category:Game Resources]] [[Category:Guides]]~~

imported>SpaceManiac: Use GitHub link for Coding Standards

2020-11-30T08:10:20Z

Use GitHub link for Coding Standards

← Предыдущая версия	Версия от 08:10, 30 ноября 2020
(нет различий)

imported>SpaceManiac: Use GitHub link for Coding Standards

2020-11-30T08:10:20Z

Use GitHub link for Coding Standards

← Предыдущая версия		Версия от 08:10, 30 ноября 2020
Строка 6:		Строка 6:

	=== 1. You must follow the coding standards ===		=== 1. You must follow the coding standards ===
	Please read through these [[Coding Standards]]. The standards will change over time. Hopefully you already read through and made sure your code adhered to them before opening your pull request!		Please read through these [https://github.com/tgstation/tgstation/blob/master/.github/CONTRIBUTING.md Coding Standards]. The standards will change over time. Hopefully you already read through and made sure your code adhered to them before opening your pull request!

	=== 2. Your code must compile. ===		=== 2. Your code must compile. ===

imported>Kosmos: /* How to Deal with Merge Conflicts */ Updated the dealing with merge conflicts guide

2017-07-30T17:38:41Z

How to Deal with Merge Conflicts: Updated the dealing with merge conflicts guide

← Предыдущая версия	Версия от 17:38, 30 июля 2017
(нет различий)

imported>Kosmos: /* How to Deal with Merge Conflicts */ Updated the dealing with merge conflicts guide

2017-07-30T17:38:41Z

How to Deal with Merge Conflicts: Updated the dealing with merge conflicts guide

← Предыдущая версия		Версия от 17:38, 30 июля 2017
Строка 56:		Строка 56:

	== How to Deal with Merge Conflicts ==		== How to Deal with Merge Conflicts ==

	~~'''DON'T USE THIS GUIDE, IT WILL BREAK EVERYTHING'''~~

	Most of the time, Git is pretty smart about merging code files. However, if one PR is merged before yours that edits the same file, your PR will be in a state of conflict and will not be able to be automatically merged via GREEN BUTTON. Because there are more contributors than there are maintainers, most of the time resolving these conflicts falls to the maker of the PR.		Most of the time, Git is pretty smart about merging code files. However, if one PR is merged before yours that edits the same file, your PR will be in a state of conflict and will not be able to be automatically merged via GREEN BUTTON. Because there are more contributors than there are maintainers, most of the time resolving these conflicts falls to the maker of the PR.

	~~Fixing~~ merge conflicts ~~with TortoiseGit's rebasing~~:		An easy way to fix merge conflicts is to make a new branch (you should especially do this if your PR is just a small one):
	# Right-click your working folder, go '''TortoiseGit''' --> '''~~Pull~~...'''		# Switch to your master branch: Right-click your working folder, go '''TortoiseGit''' --> '''Git Switch/Checkout...'''
	# ~~On the top, from~~ the '''~~Remote~~'''-list~~, select '''upstream'''~~ and ~~from the '''Remote Branch'''-list~~ select '''master'''.		# Look at the '''Branch'''-list and select '''master'''
	# ~~Click '''OK'''.~~		# Close the window that pops up (assuming it changed successfully)
	~~# This part needs a good guide how to actually use~~ the ~~merge-conflict-yellow-orange-program~~ (~~I can't remember how~~ it ~~goes and don't have any actual merge conflicts now~~)		# Right-click your working folder, go '''TortoiseGit''' --> '''Git Pull...'''
	# Right-click your working folder, go '''TortoiseGit''' --> '''~~Push~~...'''		# On the top, from the '''Remote'''-list, select '''upstream''' and from the '''Remote Branch''' -list select '''master'''.
	# ~~Push as you would normally~~, ~~except down in~~ '''~~Options~~''', ~~next to~~ '''~~Force:~~''' select '''~~known changes~~'''.		# Close the window that pops up (assuming it updated successfully)
	# ~~Click~~ '''OK'''.		# Make the same exact changes to the code which you have on your PR
			# Commit and MAKE A NEW BRANCH
			# Push your new branch to your PR branch, and tick '''Force: unknown changes'''

imported>Factoryman942: /* 1. You must follow the coding standards */

2017-02-10T00:07:44Z

1. You must follow the coding standards

← Предыдущая версия	Версия от 00:07, 10 февраля 2017
(нет различий)

imported>Factoryman942: /* 1. You must follow the coding standards */

2017-02-10T00:07:44Z

1. You must follow the coding standards

← Предыдущая версия		Версия от 00:07, 10 февраля 2017
Строка 6:		Строка 6:

	=== 1. You must follow the coding standards ===		=== 1. You must follow the coding standards ===
	Please read through these [[~~Coding_Standards~~]]. The standards will change over time. Hopefully you already read through and made sure your code adhered to them before opening your pull request!		Please read through these [[Coding Standards]]. The standards will change over time. Hopefully you already read through and made sure your code adhered to them before opening your pull request!

	=== 2. Your code must compile. ===		=== 2. Your code must compile. ===

imported>Oranges: Undo revision 17378 by Oranges (talk)

2016-12-02T23:37:47Z

Undo revision 17378 by Oranges (talk)

← Предыдущая версия	Версия от 23:37, 2 декабря 2016
(нет различий)

imported>Oranges: Undo revision 17378 by Oranges (talk)

2016-12-02T23:37:47Z

Undo revision 17378 by Oranges (talk)

@@ Строка 3: / Строка 3: @@
 Before you do this, though, there are have some requirements so your code doesn't make SS13's infamous spaghetti code problems even worse.  Make sure your code fits these requirements or your pull will not be accepted.  You may also want to read through the suggestions section.
-This has been moved to here: https://github.com/tgstation/tgstation/blob/master/CONTRIBUTING.md
+= Pull Request Requirements =
 {{Contribution guides}}
 [[Category:Game Resources]] [[Category:Guides]]