melbo
Well-known member
Question:
There are updates to the main Frug branch https://github.com/Frug/AJAX-Chat but not to the xf integrated tree https://github.com/Frug/AJAX-Chat/tree/xenforo.
Should I pull the main files and attempt to merge or is there a better solution to updating my installation?
Or perhaps I don't understand GitHub and the files are stacked so that a Branch also includes Master files
There are updates to the main Frug branch https://github.com/Frug/AJAX-Chat but not to the xf integrated tree https://github.com/Frug/AJAX-Chat/tree/xenforo.
Should I pull the main files and attempt to merge or is there a better solution to updating my installation?
Or perhaps I don't understand GitHub and the files are stacked so that a Branch also includes Master files
Last edited: