search

zikula-modules / DizkusModule

Official repository for Dizkus, a fully integrated forum solution for Zikula 1.4+
21 stars 7 forks source link

Remove duplicated code in entities #333

Closed Kaik closed 6 years ago

Kaik commented 6 years ago

Cleaning after the last merge.

Kaik commented 6 years ago

I think I have found what was the problem that caused duplicate code after merge that was not shown during the merge (no conflict). Generally, my workflow was wrong I have decided at the beginning that I will work on both versions separately so I was working on master and then I was committing same code to v5 version different commits same code - then I have decided to follow core workflow (lowest version first) so I have merged v5 into master and as you might expect git added same code again... without any conflict same thing happened with InterCom before... I have made a diff and looks like only those classes have duplicated code I think that fixing it this way will work and since now I can start using core workflow...

https://stackoverflow.com/questions/36889915/line-endings-git-merge-creates-duplicates-without-conflict @craigh If you have any thoughts about this let me know

Kaik commented 6 years ago

So to clean everything and preserve all work, and start with new workflow I will merge this then I will merge back master into v5 with all the changes needed (hooks) and then I will start working on v5 a merge up new code into master hopefully this will work as expected.