Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[ptp-dev] ptp_6_0 branch created

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



Back to the top