search

orionsbelt-battlegrounds / game

Mozilla Public License 2.0
1 stars 0 forks source link

Boostrap the app #1

Closed donbonifacio closed 8 years ago

jqmtor commented 8 years ago

I am done with the review @donbonifacio . Let me know when you want me to take a new look at this.

donbonifacio commented 8 years ago

@quimrstorres I think this is done. Had some issues and created a merge commit over there in the middle, don't know if you can teach me how to remove it.

jqmtor commented 8 years ago

@donbonifacio , sure. What you need is to do an interactive rebase. I ran the commands myself so I don't forget anything.

1) Start interactive rebase and provide the hash of the previous commit from the one you want to change/remove. In this case you can do:

git rebase -i HEAD~3

2) The interactive rebase interface will show up and you will notice that the strange "Merge upstream" message will not appear. I thought it would, and if it did, I would just eliminate the commit by replacing pick with drop in the beginning of the line corresponding to that commit (the instructions given by git on this interface are pretty clear). Since the commit does not appear, I decided to just try out rewriting the history and see if the merge conflict that you had came up.

3) The merge conflict did in fact come up, making the rebase stop and asking me to solve the conflicts before proceeding. All I had to do was editing the files to solve the conflicts and running:

git add .
git rebase --continue

4) Since you rewrote the history, you will need to force push the code to origin.

git push -f

And that seals the deal. I don't quite get what happened, since I never had such a problem. It is very intriguing to me that the commit message does not show up on the interactive rebase.

Just a final note:

You could use this same strategy for rewriting the commit message on the pull request where you forgot to explain the changes on the type hints. All you needed to do is to use interactive rebase again and write reword or r in the beginning of the line corresponding to that commit. I don't think you need to do it, I just wanted to point it out because I thought you would find it interesting for the future.

jqmtor commented 8 years ago

Feel free to merge when you solved the issue and let me know if the explanation was helpful. :+1:

donbonifacio commented 8 years ago

Awesome @quimrstorres , pretty straightforward, gonna start using this a lot. Also updated the commit. Thanks! :D