Page 1 of 1
how compare my fork on bitbucket with actual revision?
Posted: Thu Mar 16, 2017 9:03 pm
by KGB1st
Hallo ppl. Help me. I need to caompare my old fork with l2j_server rep.
I use sourcetree on bitbucket. Thanks.
Re: how compare my fork on bitbucket with actual revision?
Posted: Fri Mar 17, 2017 12:06 pm
by HorridoJoho
You can use a tool like WinMerge to compare a directory structure with text files.
Another alternative would be to load the old Project into l2j, now clone the new git repository. Delete all files expect svn/git files in the old Project and overwrite it with the sourcecode from the new repository. Now you can create a patch.
Re: how compare my fork on bitbucket with actual revision?
Posted: Fri Mar 17, 2017 4:15 pm
by KGB1st
wtf? You must using a merge function.
I tried but got a lot of conflicts, so I update conflicts manualy and merge with orig branch.
2017-03-17_220133.jpg