Closed AlvaroBurnett closed 4 years ago
Sorry, I'm not too familiar with Git. I'm not sure how to rebase the branch without screwing everything up. Is it OK if I do the following?
git checkout fix_anim_script git rebase master // edit the source code to fix the merge conflict git add . git rebase --continue git branch -m fix_anim_script_REBASED git push origin HEAD
And finally I go to GitHub and create a new pull request?
Yep, that should work I think.
Looks good, but I merged the other changes first so this will need to rebased.