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 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Ĭheckout your branch for the feature git checkout I'll cry, substitute your actual branch name in here Git is a powertool and if you don't train yourself you will lose figurative fingers (and real code and hours of work) If you don't understand this, read this entire book through: upstream : points to the tgstation repository itself.origin : points to your own fork of tgstation.Manually resolving icon conflicts (oranges's guide)Īssuming the following layout of your git repository: The console log will indicate if it was successful or if further action is needed. Linux users: run tools/hooks/dmi.merge -posthoc.Open the tools/dmi folder and double-click Resolve Icon Conflicts.bat.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: Resolve conflicts on an in-progress merge Once complete, the icon merger script will automatically run every time you git merge. Linux users: run tools/hooks/install.sh.
Github desktop resolve conflicts install#
Install the hook: Open the tools/hooks folder and double-click Install.bat.2.9 but oranges, I am a brainlet and I use tortise gitĪutomatic icon conflict resolver Use as a Git Hook.2.6 Add all conflicted files you have resolved.
0 kommentar(er)
