Best method for updating code

[glizzzy]

Hey All,

Just wanted to pop in to ask a question regarding updating the source code while I create a map. The questions is thus:

How do I go about creating a map while being able to update the source code and keep my changes? Once I "pull" I think from github will it merge the files or replace mine with the new?

If clarification is needed I'd love to explain further. I just really want to create a map. I've messed around with it for quite some time.

[Qustinnus]

If I understand you correctly; you should be fine. Pulling essentialy gets any files that have changed and tries to merge them. If there's a merge conflict it will tell you. If you're making a new map this should never cause issues as you're not changing files that the pull would have to merge.

[SpaceManiac]

Start with this section in the guide:
https://tgstation13.org/wiki/Setting_up ... _your_Repo

[glizzzy]

If I understand you correctly; you should be fine. Pulling essentialy gets any files that have changed and tries to merge them. If there's a merge conflict it will tell you. If you're making a new map this should never cause issues as you're not changing files that the pull would have to merge.

Ah dope. So I can just check every now and then and update the code pretty much base tg I dont think i'll make many changes and develop my map without worrying of getting stuck on an old source?

How about sprites say I change the chair sprites, will it overwrite my chair sprites pulling the newest code?

[Qustinnus]

It'll throw a merge conflict, you'd need to fix it by manually copy pasting the sprites you want

[glizzzy]

It'll throw a merge conflict, you'd need to fix it by manually copy pasting the sprites you want

Sick. Thanks for all the help!

[SpaceManiac]

there's a script for icon conflicts https://github.com/tgstation/tgstation/ ... -conflicts

[Qustinnus]

wont that fuck up if theres icon with the same name?

[SpaceManiac]

it will yell at you but still do its job if it attempts to operate on an icon file with two of the same icon state
this is also displayed as an error in Dream Maker anyways, so just fix it