how compare my fork on bitbucket with actual revision?

If something doesn't fit in any other forum then post it here.
Forum rules
READ NOW: L2j Forums Rules of Conduct
Post Reply
User avatar
KGB1st
Posts: 230
Joined: Sat Jul 26, 2014 5:58 pm

how compare my fork on bitbucket with actual revision?

Post by KGB1st » Thu Mar 16, 2017 9:03 pm

Hallo ppl. Help me. I need to caompare my old fork with l2j_server rep.

I use sourcetree on bitbucket. Thanks.

HorridoJoho
L2j Senior Developer
L2j Senior Developer
Posts: 795
Joined: Sun Aug 14, 2005 11:27 am

Re: how compare my fork on bitbucket with actual revision?

Post by HorridoJoho » Fri Mar 17, 2017 12:06 pm

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.

User avatar
KGB1st
Posts: 230
Joined: Sat Jul 26, 2014 5:58 pm

Re: how compare my fork on bitbucket with actual revision?

Post by KGB1st » Fri Mar 17, 2017 4:15 pm

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. :problem:
2017-03-17_220133.jpg
You do not have the required permissions to view the files attached to this post.

Post Reply