search

lucabriguglia / Weapsy

ASP.NET Core CMS
http://www.weapsy.com
Other
10 stars 2 forks source link

Merge issue #21

Closed subtata-emfluence closed 7 years ago

subtata-emfluence commented 7 years ago

I don't know whether this is really an issue or not! I am checking out to my language-selection branch and using git merge master which is supposed to merge master branch into language-selection. But it always says Already up to date.

  1. Do you still see merge conflicts? Is this still not possible to merge my latest changes? I really need your help here to resolve those conflicts. Hope you would be able to extract some time for me.

  2. I did a fresh clone from master (not forked one) which is the latest version (you made the latest commit some 12 hours ago), but I cannot see any changes I made fro the beginning. Are they not merged into it? I can rework on those, which is not a problem but asking this out of curiosity.

Waiting for your reply.

lucabriguglia commented 7 years ago

Hi,

sorry for the delay but I'm still on holiday.

You should try to merge again because with the latest change the project structure changed completely.

subtata-emfluence commented 7 years ago

Hi, No problem. I thought you forgot me! :)

I can see you have made a lot of changes in the project already. What if I create a fresh clone from master and start from there? Because I was getting some merge conflicts I think it would be a better way to resume with a fresh codebase. I will let you know when I get the fresh clone so that you can tell me what to do next. Waiting for your suggestion.

lucabriguglia commented 7 years ago

I didn't :-) Just very busy time plus holidays. I'm back today.

subtata-emfluence commented 7 years ago

Thank you! I will do the fresh clone tomorrow morning and get back to you.