Tempust85 Posted April 17, 2015 Share Posted April 17, 2015 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. Link to comment
Raz0r Posted April 18, 2015 Share Posted April 18, 2015 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 Link to comment
Cerez Posted April 18, 2015 Share Posted April 18, 2015 This may help:http://stackoverflow.com/questions/7244321/how-to-update-github-forked-repository Also: gerbilOFdoom and Tempust85 like this Link to comment
Recommended Posts
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 accountSign in
Already have an account? Sign in here.
Sign In Now