Pull request for README.md file showing addition of translation comment as discussed#166
Pull request for README.md file showing addition of translation comment as discussed#166trekr5 wants to merge 16 commits intohacketyhack:masterfrom trekr5:master
Conversation
Conflicts: Gemfile features/support/env.rb spec/spec_helper.rb
|
Hi there, Thank you for making this pull request. You still seem to have a lot of differing commits on your hackety-hack.com fork/local repository. I can not really merge it in like this (e.g. all the haha commits etc.), which we do not want to have in then history here. That's the problem I told you about after the last merge with the differing histories. The easiest solution would be to make a new fork/clone of the hackety-hack.com project to get rid of those. However that would also result in any additional work you've done so far being lost, which is no good. So I believe it would be best if you talked to your coach about getting your repository back into a state that is in line with the master branch of this repository. Sorry I do not know of a good guide out there on how to fix this ( @spaudanjo do you know one?) and am running low on time after the production fix for this site this morning =) I can cherry-pick the one translations commit from here later for the time being but we should really get onto fixing the state of your repository :-) Cheers, |
|
Will just have to do that like you said i.e.make a new fork/clone of the hackety-hack.com because no one seems to know how to help me with this problem. |
|
Handled in #168 |
No description provided.