New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Removed unnecessary space in application.rb #1315
Conversation
To clarify why I removed the extra space in application.rb and added it to the comment_if helper is because when the following four lines are generated: require "active_record/railtie" The first one had a leading space, causing it to be not formatted correctly. |
Removed unnecessary space in application.rb
Somehow I wish those three commits to be rebased together before get merged. This is too easy. |
How would one do that? I'm extremely new to rails, and programming altogether actually. It seems to be too late now, since it's already merged, but for future reference? Thanks! |
Aha, I'll explain to you for your further reference. Your keywords for today are First you'll want to look up for the commit before your commits. you can do so by
So now we see the SHA of that commit, we can then run "interactive rebase" with that.
This will open your text editor with the list of commits. It will be something along the line like this:
If you look at the comments there, you'll see that we need to change
Now if you save and quit that file, another editor will come up and asking you to change commit message.
Then you just change your wording to describe those commits. After that, save and close your editor. It should say something like this:
Now you can force push to your remote. I assume that you have a remote name
You'd then see that it pushes successfully and it would also say "forced update" in that log. Now wait for about 1 minute and your pull request will automatically updated with new commit. Note Note NoteAlways use git rebase and force push only if you're the only single developer on that repository. This will be fine with your fork of Rails, as you're the single person accessing/pushing it. I would not recommend you do something like this if you're sharing a repository with somebody else, as they would facing an error that the original commit was disappeared and now they won't be able to run |
Thanks! I'll try to do that later. I appreciate it! |
I agree, I will be more careful next time. The problem is that I usually don't look at the number of commits, just the diff after the pull request. And the diff showed just one line change. :( |
I followed your excellent instructions sikachu, I forced push to my fork. So I guess that's all I have to do then? Sorry José for the mixup. Thanks guys, definitely a learning process :) |
I removed the extra leading space in the application.rb that is generated with 'rails new'.