Hi,
I’ve opened one pull request on Seaside:master (develop is behind master, so I chose the most recent branch) and on on Grease:dev. I wasn’t sure about metadataless format for FileTree etc., so if you need me to do something differently let me know. Cheers, Max
_______________________________________________ seaside-dev mailing list [hidden email] http://lists.squeakfoundation.org/mailman/listinfo/seaside-dev |
Hey Max, I think a pull request on dev is required. There is a more recent change on master but many commits are only on dev. I just did not follow up very well after the last esug sprint what the state of seaside develop branch is… But we should get those changes on master and release a new version. Since we require a new Grease version, a 3.3 is in order
_______________________________________________ seaside-dev mailing list [hidden email] http://lists.squeakfoundation.org/mailman/listinfo/seaside-dev |
Done. I attempted to merge master back into develop but a git merge is a nightmare with all the meta data. The PR now only includes my changes. I've closed the original PR on master. Cheers, Max
_______________________________________________ seaside-dev mailing list [hidden email] http://lists.squeakfoundation.org/mailman/listinfo/seaside-dev |
Hey Max,
The mc metadata nightmare in git is fixed when you install GitFileTree-Mergedriver of Thierry Goubier [1]. I’m attending Grease at the moment and since the changes are minimal, I will try to fix the metadata merge conflicts by hand.
_______________________________________________ seaside-dev mailing list [hidden email] http://lists.squeakfoundation.org/mailman/listinfo/seaside-dev |
Ok. With the move to Iceberg that will not be an issue anymore anyway.
If it's too much of a hassle let me know and I'll make a clean version.
_______________________________________________ seaside-dev mailing list [hidden email] http://lists.squeakfoundation.org/mailman/listinfo/seaside-dev |
Free forum by Nabble | Edit this page |