Hi Xavier, I merged from the trunk to my local environment, I fixed the conflict and then pushed back to alpha0.4
Regards Vlad From: [email protected] [mailto:[email protected]] On Behalf Of Xavier Antoviaque Sent: Wednesday, June 30, 2010 12:28 PM To: [email protected] Subject: [HackIt Bar] [Code] Merging with trunk before pushing changes Hi Vlad, I've had conflicts with your latest pushes to the alpha0.4 repository (with index.php) - could you make sure you have merged changes from the trunk line before pushing new versions? Some are long-standing changes (like improving the header metadata). I've updated http://community.hackit.cx/wiki/Requirements_and_deliverables_for_patch_submission with this - it should catch most of the conflicts before it reaches the live/test version. Thanks! Xavier.
_______________________________________________ Hackit Bar mailing list - [email protected] Wiki: http://community.hackit.cx/ List: http://community.hackit.cx/ml/ Forum: http://community.hackit.cx/forum/ Ideas: http://community.hackit.cx/ideas/ IRC: irc://irc.freenode.net/#politis
