-
Notifications
You must be signed in to change notification settings - Fork 210
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
Photo Album features #26
Comments
@w0www Yes it is still not stable yet. I need to fix a few issues before merging it back to master. And since this links to a blog post tutorial I am planning to create a separate branch for that and then merge everything into master 👍 |
@sudharti Ok!! thanks. I am advancing in a fork. You can see the changes my master branch. I have photoAlbum but get some errors. |
@w0www Could you tell me more info on the error you are facing? |
Now appear this error: in app/views/comments/_form.html.erb But before when i had created the PhotoAlbum appeared an error that said "not commentable method for Class" |
@w0www From your Pull Request https://github.com/w0www/socify/pull/2 I see you have merged develop into master. Develop has a lot of new features and refactoring. So you cannot automatically merge it. Some files need to be reviewed. Didn't you get any conflicts while merging? Or if you had rebased you would have got a few merge conflicts. |
The problem you are facing is because the develop branch doesn't have the mentionable feature yet. If you see https://github.com/sudharti/socify/blob/develop/app/views/comments/_comment.html.erb and the one in master https://github.com/sudharti/socify/blob/master/app/views/comments/_form.html.erb. You see the master one has user mentionable feature while develop doesn't. I will work on merging it onto master. But if you want to resolve it you need to update it to the latest in develop. |
@sudharti yes i get a lot of conflicts while merging. First i have tried merge Master into develop to get the last changes of master. Then i have done a PR from develop to Master without conflicts. I may be wrong when i do merge because I not know the changes |
@w0www Sorry about that. I did receive a few Pull Requests to master while I was working on the develop branch. So kind of messed up a little there. But I will be merging develop into master once it's stable. I will keep this issue open. Will notify you if you want. |
Yes, please notify me. And if you has more ideas or more features, i can help you, you know! ;) Thanks mate! |
@w0www Cool. Thanks 👍 |
I have seen in other branch that the feature is implemented but in master not appear. ¿Why?
The text was updated successfully, but these errors were encountered: