Re: [ptp-dev] ptp_6_0 branch created

[Chris Recoskie <recoskie@xxxxxxxxxx>]

I tend to apply my changes manually to both branches rather than merging. Is that workflow going to be a problem?

===========================
Chris Recoskie
Team Lead, IBM CDT and RDT
IBM Toronto

Greg Watson ---09/27/2012 10:01:50 AM---Hi, I've created a ptp_6_0 branch for the Juno version of PTP. Kepler builds will now come from the

From: Greg Watson <g.watson@xxxxxxxxxxxx>
To: Parallel Tools Platform general developers <ptp-dev@xxxxxxxxxxx>
Date: 09/27/2012 10:01 AM
Subject: [ptp-dev] ptp_6_0 branch created
Sent by: ptp-dev-bounces@xxxxxxxxxxx

---

Hi,

I've created a ptp_6_0 branch for the Juno version of PTP. Kepler builds will now come from the master branch.

Please review the documentation[1] for working on multiple branches, but in summary:

- bug fixes that affect both branches should be committed to the ptp_6_0 branch and then merged with master
- bug fixes that are only for ptp_6_0 branch must be committed to the ptp_6_0 branch and merged with master, then reverse the commit in master
- changes only for master can be committed directly to the master branch

Thanks,
Greg

[1] http://wiki.eclipse.org/PTP/environment_setup/git#Committing_and_Merging

_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/ptp-dev