Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [ptp-dev] Git PTP project recommendations, rebase etc.

Was this discussed in the ptp-dev meeting last week?
(see previous posts on this thread)

Git still mysteriously misbehaves for me, and i want to make a branch to do some code changes and am not at ALL trusting that this is not going to make a big mess
when we haven't even agreed on what the developer setup should be on the page at http://wiki.eclipse.org/PTP/environment_setup_70#Checking_out_PTP_projects

I have not changed my initial setup from the above wiki page. I'm working in master (ptp 7.0 kepler work)
project>Team>Switch To>New Branch...  can someone please advise 'Source Ref' and pull strategy to use?
And then what i do to merge in changes from elsewhere while i'm working and how to commit/merge with master branch when i'm ready?

All of the docs I've read spend too much time telling me how wonderful git is and not enough time just telling me HOW to do something.
Perhaps there are enough different ways to do it that the suggested workflows depend on how each project uses git by convention.
If so then if i can document it, perhaps i will be more comfortable with it.


...Beth

Beth Tibbitts
Eclipse Parallel Tools Platform  http://eclipse.org/ptp
IBM STG - High Performance Computing Tools
Mailing Address:  IBM Corp., 745 West New Circle Road, Lexington, KY 40511


Back to the top