Jump to content

How To Update A Fork


Tempust85

Recommended Posts

Posted

Can someone please explain in detail how to grab the latest updates from OpenJK to my fork? I get conflicts and I'd like to know the process to fix and continue. :)

Posted

Conflicts are only natural if you've both modified similar areas in the same files.

The best way to resolve them is with a merge tool, e.g. Meld

Tempust85 likes this

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now
×
×
  • Create New...