Git merging and branching is always an issue, and without Git-flow things can get complicated. Here are some simple rules we go by at Wagento.
7600 Wayzata Blvd, Suite 1B Golden Valley, MN 55426 United States of America
Phone: +1-612-594-7699 Email: email@example.com
Calle San Lorenzo #673 B Cochabamba, Bolivia
Phone: +591-4-4589184 Email: firstname.lastname@example.org
403, Ashirvad Paras, Opp Prahladnagar Garden Corporate Road Ahmedabad, Gujarat
Phone: +91-79-40028989 +1 (612) 483-0650