Looks good, but in the meantime other commits have affected code this changes, so need to rebase to make the two fit together. I'd also like to squash the commits down so it's just one big commit.
First of all, presuming you're using the Git command line, can you do (apologies if you know this already):
git remote add upstream https://github.com/rnicoll/cate.git # Tell Git "upstream" is my copy of cate
git fetch upstream # Get everything from upstream
git rebase upstream/master # Base your changes on latest upstream
It will complain about merge conflicts - you'll need to go into the files it says there's problems with (MainController.java in this case), and look for sections with <<<<<<< near them. That will show you what the old code was, and what the new code is, and you need to reconcile the two. When done, "git add" the file to let Git know, and then "git rebase --continue" to continue rebasing. Make sure it all works okay afterwards!
Then, can you do "git rebase -i HEAD~4" (Git rebase, interactive, back 4 commits from HEAD), and on everything but the last commit change "pick" to "fixup" to merge the commits.
Lastly, once that's all rebased, do "git push -f origin " to push the whole lot back.
rnicoll
commented
8 years ago
Looks good, but in the meantime other commits have affected code this changes, so need to rebase to make the two fit together. I'd also like to squash the commits down so it's just one big commit.
First of all, presuming you're using the Git command line, can you do (apologies if you know this already):
git remote add upstream https://github.com/rnicoll/cate.git # Tell Git "upstream" is my copy of cate git fetch upstream # Get everything from upstream git rebase upstream/master # Base your changes on latest upstream
It will complain about merge conflicts - you'll need to go into the files it says there's problems with (MainController.java in this case), and look for sections with <<<<<<< near them. That will show you what the old code was, and what the new code is, and you need to reconcile the two. When done, "git add" the file to let Git know, and then "git rebase --continue" to continue rebasing. Make sure it all works okay afterwards!
Then, can you do "git rebase -i HEAD~4" (Git rebase, interactive, back 4 commits from HEAD), and on everything but the last commit change "pick" to "fixup" to merge the commits.
Lastly, once that's all rebased, do "git push -f origin" to push the whole lot back.