Can you post the output of the command git log?
Seems you have Eluna and Objscale. The errors seem to be caused at least partly from that.
Try getting the current commit's hash you are on and save it in case things go wrong.
You would need to manually solve the errors marked with these tags in the files:
For the eluna conflicts it might be better to select the one with Eluna code (the first code block). (unsure if both work or both fail)Code:<<<<<<< HEAD // Code you have ======= // Code the merged repo has >>>>>>>
For the conflicts about code about modelids use the second code block.
After that see that there are no more conflicts and commit.
Then pull Eluna and try to solve any new conflicts.
When you want to try revert back to where you were, try using git reset --hard <yoursavedcommithash>
Last edited by Rochet2; 02-25-2016 at 10:26 AM.Awards:
Did you try the stuff I suggested?
Unsure if there are better ways .. but ..
Another way to do this is to abort any merge you made so far (git merge --abort)
What this does is basically create a new branch, get the latest Eluna, merge latest objscale with it (and here you should merge any other stuff you use, like transmog, reforging .. whatever).Code:git checkout -b update git add -A git reset --hard Eluna/master git pull Rochet2/objscale git checkout master git merge update git branch -D update
Then once all those are merged together, it changes back to the original branch and merges the update branch to it and then deletes the update branch.
Everything you do you should do in the source root folder.
What is this "build" folder? Sounds like it is the folder that contains the trinitycore.sln file, which is where you should not be executing commands at.
There are currently 1 users browsing this thread. (0 members and 1 guests)