Resolving icon conflicts - История изменений

imported>Dragomagol: Removed IRC mentions (killing soul)

2023-05-12T04:14:25Z

Removed IRC mentions (killing soul)

← Предыдущая версия		Версия от 04:14, 12 мая 2023
Строка 29:		Строка 29:
	git is a powertool and if you don't train yourself you will lose figurative fingers (and real code and hours of work)		git is a powertool and if you don't train yourself you will lose figurative fingers (and real code and hours of work)

	that said, if you get stuck, come find us on the ~~irc~~, I'll do my best to help you, assuming you can follow simple instructions		that said, if you get stuck, come find us on the discord, I'll do my best to help you, assuming you can follow simple instructions

	== checkout your branch for the feature ==		== checkout your branch for the feature ==
Строка 48:		Строка 48:

	=== Note ===		=== Note ===
	'''Follow every step in this guide, do not skip any, if you get any output you do not understand or that mentions errors ~~contact the irc or~~ ask for help in the code discord channel, do not blindly continue! You wouldn't put the legs on an ikea table upside down and then keep going like nothing is wrong would you?'''		'''Follow every step in this guide, do not skip any, if you get any output you do not understand or that mentions errors ask for help in the code discord channel, do not blindly continue! You wouldn't put the legs on an ikea table upside down and then keep going like nothing is wrong would you?'''

	== Fetch upstream and merge ==		== Fetch upstream and merge ==

imported>San7890: Adds some help to Github Desktop users.

2022-09-12T01:10:34Z

Adds some help to Github Desktop users.

← Предыдущая версия		Версия от 01:10, 12 сентября 2022
Строка 80:		Строка 80:
	Right-click on your repository and use the "start Git Bash Here"		Right-click on your repository and use the "start Git Bash Here"

	== I use github desktop ~~because I'm even worse than that previous guy~~ ==		== I use github desktop ==
	~~There's no hope~~ for ~~you~~, ~~install~~ git-bash for windows https://git-scm.com/downloads and right click on your repository and use the "start Git Bash here" option		Although originally written to operate for Map Merge Conflicts, the same principles to help resolve DMI (Icon) conflicts in a step-by-step guide can be found [https://hackmd.io/@tgstation/ry4-gbKH5#Assured-Merge-Conflict-Resolution here].


			However, it is not at all a bad idea to start using git-bash for windows https://git-scm.com/downloads and right click on your repository and use the "start Git Bash here" option

	== kraken ==		== kraken ==

imported>SpaceManiac: Update instructions for PR 55658

2020-12-23T04:37:42Z

Update instructions for PR 55658

← Предыдущая версия		Версия от 04:37, 23 декабря 2020
Строка 3:		Строка 3:
	= Automatic icon conflict resolver =		= Automatic icon conflict resolver =

	== ~~First-time setup~~ ==		== Use as a Git Hook ==

	# Install ~~[https~~:~~//www.python.org/downloads/ Python 3.6] or newer, choosing~~ the ~~"Add to PATH" option.~~		# '''Install the hook''': Open the <code>tools/hooks</code> folder and double-click <code>Install.bat</code>
	~~# Run~~ <tt>tools/hooks/~~install~~.bat</tt> ~~(details in the [https~~:~~//github.com/tgstation/tgstation/blob/master/~~tools/hooks/~~README.md Git hooks documentation])~~.		#* Linux users: run <code>tools/hooks/install.sh</code>

	Once complete, the icon merger script will '''automatically''' run every time you <tt>git merge</tt>.		Once complete, the icon merger script will '''automatically''' run every time you <tt>git merge</tt>. The console log will indicate if it was successful or if further action is needed.

	~~The icon merger script may not be compatible with some Git GUI tools. TortoiseGit and GitHub Desktop are known ''compatible''; please report issues encountered while using these.~~		== Resolve conflicts on an in-progress merge ==

	~~== Use ==~~		If you are using a Git GUI which does not run the hook on merge, you can also run the conflict resolver on an in-progress merge by request:
			# Open the <code>tools/dmi</code> folder and double-click <code>Resolve Icon Conflicts.bat</code>
			#* Linux users: run <code>tools/hooks/dmi.merge --posthoc</code>

	~~Simply perform a Git merge (<tt>git merge</tt> or compatible GUIs) and the icon merger will run. It will show progress output, which~~ will indicate if it was successful or if further action is needed.		The console log will indicate if it was successful or if further action is needed.

	~~For questions or troubleshooting, visit our coderbus~~.

	= Manually resolving icon conflicts (oranges's guide) =		= Manually resolving icon conflicts (oranges's guide) =

imported>SpaceManiac: Add breadcrumbs

2020-11-30T06:32:59Z

Add breadcrumbs

← Предыдущая версия		Версия от 06:32, 30 ноября 2020
Строка 1:		Строка 1:
			: [[Guide to contributing to the game]] > [[Guide to spriting]]

	= Automatic icon conflict resolver =		= Automatic icon conflict resolver =

imported>SpaceManiac: /* Automatically icon conflict resolver */ fix grammar

2020-11-30T05:34:31Z

Automatically icon conflict resolver: fix grammar

← Предыдущая версия		Версия от 05:34, 30 ноября 2020
Строка 1:		Строка 1:
	= ~~Automatically~~ icon conflict resolver =		= Automatic icon conflict resolver =

	== First-time setup ==		== First-time setup ==

imported>SpaceManiac: /* First-time setup */ styles

2020-11-30T04:40:43Z

First-time setup: styles

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

	# Install [https://www.python.org/downloads/ Python 3.6] or newer, choosing the "Add to PATH" option.		# Install [https://www.python.org/downloads/ Python 3.6] or newer, choosing the "Add to PATH" option.
	# Run `tools/hooks/install.bat` (details in the [https://github.com/tgstation/tgstation/blob/master/tools/hooks/README.md Git hooks documentation]).		# Run <tt>tools/hooks/install.bat</tt> (details in the [https://github.com/tgstation/tgstation/blob/master/tools/hooks/README.md Git hooks documentation]).

	Once complete, the icon merger script will automatically run every time you <tt>git merge</tt>.		Once complete, the icon merger script will '''automatically''' run every time you <tt>git merge</tt>.

	The icon merger script may not be compatible with some Git GUI tools. TortoiseGit and GitHub Desktop are known compatible; please report issues encountered while using these.		The icon merger script may not be compatible with some Git GUI tools. TortoiseGit and GitHub Desktop are known ''compatible''; please report issues encountered while using these.

	== Use ==		== Use ==

imported>SpaceManiac: Port from GitHub wiki with minimal tidying

2020-11-30T04:40:16Z

Port from GitHub wiki with minimal tidying

Новая страница

= Automatically icon conflict resolver =

== First-time setup ==

# Install [https://www.python.org/downloads/ Python 3.6] or newer, choosing the "Add to PATH" option.
# Run `tools/hooks/install.bat` (details in the [https://github.com/tgstation/tgstation/blob/master/tools/hooks/README.md Git hooks documentation]).

Once complete, the icon merger script will **automatically** run every time you <tt>git merge</tt>.

The icon merger script may not be compatible with some Git GUI tools. TortoiseGit and GitHub Desktop are known *compatible*; please report issues encountered while using these.

== Use ==

Simply perform a Git merge (<tt>git merge</tt> or compatible GUIs) and the icon merger will run. It will show progress output, which will indicate if it was successful or if further action is needed.

For questions or troubleshooting, visit our coderbus.

= Manually resolving icon conflicts (oranges's guide) =

Assuming the following layout of your git repository:

* '''origin''' : points to your own fork of tgstation
* '''upstream''' : points to the tgstation repository itself

If you don't understand this, read this entire book through: https://git-scm.com/book/en/v2

git is a powertool and if you don't train yourself you will lose figurative fingers (and real code and hours of work)

that said, if you get stuck, come find us on the irc, I'll do my best to help you, assuming you can follow simple instructions

== checkout your branch for the feature ==
git checkout {yourbranch}
Side note, if one of you actually tries to checkout a branch named <tt>{yourbranch}</tt> I'll cry, substitute your actual branch name in here
== make sure you have the latest copy of your branch (in case you worked on it at work (implying you're employed lol) or something) ==
git pull
== Copy your icon states to safety ==
Use dreammaker to copy your changed conflicting icon/iconstates out of the project folder to somewhere safe

YOU MUST DO THE ABOVE STEP OR YOU WILL LOSE YOUR ICON/ICON STATES

also I will laugh at you

Close dreammaker (completely quit it) (Seriously, do it, it tends to cache stuff and not see git changing files)

Also if you have the daemon running (DreamDaemon) close that, it might get in the way

=== Note ===
'''Follow every step in this guide, do not skip any, if you get any output you do not understand or that mentions errors contact the irc or ask for help in the code discord channel, do not blindly continue! You wouldn't put the legs on an ikea table upside down and then keep going like nothing is wrong would you?'''

== Fetch upstream and merge ==
git fetch upstream
git merge upstream/master
#At this point git will stop and complain about conflicts in a binary file (your dmi)
== Resolving conflicts ==
#first reset the file to match the latest on tgstation's master branch
git checkout upstream/master -- path/to/conflicted/file.dmi
... repeat for each conflicted file

'''Open dreammaker and copy your changed icon back into the conflicted dmi's from your safe space using DreamMaker'''

yes it's expected your file won't be in the dmi, you just reset it, that's why you copied it out earlier to a safe location.
Save and close DreamBreaker

seriously do this before using git again or you will suffer a great pain
== Add all conflicted files you have resolved ==
git add path/to/conflicted/file.dmi
... repeat as necessary
== Commit ==
git commit
#if you use a new version of git you may be able to use
git merge --continue
#instead

== Push ==
git push

== but oranges, I am a brainlet and I use tortise git ==
Right-click on your repository and use the "start Git Bash Here"

== I use github desktop because I'm even worse than that previous guy ==
There's no hope for you, install git-bash for windows https://git-scm.com/downloads and right click on your repository and use the "start Git Bash here" option

== kraken ==
<kbd>alt+t</kbd> but you probably already knew that

{{Contribution guides}}