2228fd21ba5aa1dd2c5cbd4ddec4da339238ba0c
Guides/Developers/Forking-resources-in-github.md
| ... | ... | @@ -12,4 +12,4 @@ To fork the resources repository, you will need a github account. This can be ob |
| 12 | 12 | |
| 13 | 13 |  |
| 14 | 14 | |
| 15 | -You can now make edits to the resources in your repository without worrying whether you're going to break functionality. Now whenever you update your Izenda.AdHoc.dll to the latest version, instead of copying the Resources from the zipped archive, you will go to your github interface tool (usually a command line, but GUIs are available) and fetch the upstream repository. If there are any conflicts when fetching, you can resolve these using a merge tool. Ideally, there will be no conflicts and your resources will be updated with both your changes and any changes made by us in development. This will allow you to stay current and prevent you from losing any of your own work. |
|
| ... | ... | \ No newline at end of file |
| 0 | +You can now make edits to the resources in your repository without worrying whether you're going to break functionality. Now whenever you update your Izenda.AdHoc.dll to the latest version, instead of copying the Resources from the zipped archive, you will go to your github interface tool (usually a command line, but GUIs are available) and [[fetch the upstream repository|https://help.github.com/articles/syncing-a-fork/]]. If there are any conflicts when fetching, you can resolve these using a merge tool. Ideally, there will be no conflicts and your resources will be updated with both your changes and any changes made by us in development. This will allow you to stay current and prevent you from losing any of your own work. |
|
| ... | ... | \ No newline at end of file |