Reputation: 367
I'd like to fork the CodeIgniter repo on github and make some changes to it for my personal use, which I haven't done yet, but I will once the following question is answered :)
If the CodeIgniter repo has had some changes done to it (for example, they fixed a security issue) after I forked it. How can I merge their latest changes with my forked version?
Thanks in advance
Upvotes: 3
Views: 187
Reputation: 284836
You just pull into your repo. E.g.:
git pull codeIgniterUrl remoteBranchName
Of course, you may have to merge, in which case git mergetool and/or another tool may be helpful.
Upvotes: 2