Skip to content

Amended gemfile#157

Closed
trekr5 wants to merge 9 commits intohacketyhack:masterfrom
trekr5:master
Closed

Amended gemfile#157
trekr5 wants to merge 9 commits intohacketyhack:masterfrom
trekr5:master

Conversation

@trekr5
Copy link
Copy Markdown
Contributor

@trekr5 trekr5 commented Aug 2, 2013

No description provided.

@PragTob
Copy link
Copy Markdown
Member

PragTob commented Aug 4, 2013

I will close this as this goes on in #158 where I have done some work.

So what I basically did to remove the "haha" commits:

# bring your chanced into a branch on my git repository
git checkout -b trekr5-master master
git pull https://github.com/trekr5/hackety-hack.com.git master
# do a rebase
git rebase master --interactive

The interactive rebase gives you an interface where you can remove commits (simply delete the line with the commit hash and the message, if it is nano that would be Control + K) And you can then also fixup and squash commits to make multiple commits into one commit.

Here is a post describing what git rebase does. Be aware that the above warning (rebasing something that you have already pushed) in practice only applies to when you have already pushed it and other people are using it (e.g. on the hacket-hack.com master). For Pull Requests it is relatively safe.

Another thing is that I noted that you worked on your master branch. In general people in git say "branch early, branch often" so it is good to make a new branch for every feature you work on especially if you want to open pull requests. You can do so by git checkout -b fancyNewBranchName.

As I completely removed the "haha" commits, as they had no purpose, squashed commits together and you worked on the master branch getting these changes into your repository might be a bit harder as usual. By getting the changes I mean git pull, e.g. get your repository to the same state as this repository. (I do not know, just a guess that it could be that way).
A way to get around this hassle may be to do a hard reset of your master branch (git reset --hard) on this commit: 65d3c27 (e.g. git reset --hard 65d3c2788340) and then a git pull to get the new changes. Please do not do this on your own and only together with your coach :-)

For git knowledge in general I highly recommend learn git branching. The github help also has some good all around help.

@PragTob PragTob closed this Aug 4, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants