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.

I just want to know what to put in the recommended setup instructions at http://wiki.eclipse.org/PTP/environment_setup_70#Checking_out_PTP_projects



...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

Inactive hide details for Greg Watson ---02/08/2013 02:07:43 PM---I never have set rebase=true, so presumably either can be useGreg Watson ---02/08/2013 02:07:43 PM---I never have set rebase=true, so presumably either can be used. Greg


    From:

Greg Watson <g.watson@xxxxxxxxxxxx>

    To:

Parallel Tools Platform general developers <ptp-dev@xxxxxxxxxxx>,

    Date:

02/08/2013 02:07 PM

    Subject:

Re: [ptp-dev] Git PTP project recommendations, rebase etc.

    Sent by:

ptp-dev-bounces@xxxxxxxxxxx



I never have set rebase=true, so presumably either can be used.

Greg

On Feb 8, 2013, at 12:44 PM, John Eblen <jeblen@xxxxxxx> wrote:
    I think we should stay with the current workflow of always rebasing, which has several benefits.

    The situation mentioned in the article seems like it would happen very rarely for us. The author
    is concerned about losing merge commits for feature branches that were previously merged in
    with the "--no-ff" option. This is a different workflow, I think, than what we typically use.


    John

    On Thu, Feb 7, 2013 at 10:48 AM, Greg Watson <g.watson@xxxxxxxxxxxx> wrote:
      To clarify, I don't think we should be setting branch.master.rebase=true. I think this would be fine if we were using a fetch followed by a 'git rebase -p' but that is not possible using Egit. See http://notes.envato.com/developers/rebasing-merge-commits-in-git/ for details.

      Greg

      On Feb 7, 2013, at 10:20 AM, Beth Tibbitts <tibbitts@xxxxxxxxxx> wrote:

        I have a question about PTP workspace setup with respect to git.
        In the Environment setup, I documented what I thought was a ptp-dev recommendation from Roland(?) early in our git days

        In         http://wiki.eclipse.org/PTP/environment_setup_70#Checking_out_PTP_projects
        see the bottom of that section on Checking out PTP Projects.  "ONCE ONLY" and "FOR EACH REPOSITORY YOU HAVE CLONED" section.

        Greg thinks that's not what we should be doing.  Can someone decide/edict so that we can update these instructions
        on workspace setup so that those of us less-well-versed in git set it up correctly?  (we should probably update the 6.0 instructions too)
        I recently had a big git mess that got cleaned up only with a lot of Greg's help.


        ...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

        <graycol.gif>        Beth Tibbitts---02/06/2013 04:09:26 PM---I have started an "Environment setup" wiki page for PTP 7.0 / Kepler It's at http://wiki.eclipse.org
<ecblank.gif>
    From:
<ecblank.gif>
Beth Tibbitts/Watson/IBM@IBMUS
<ecblank.gif>
    To:
<ecblank.gif>
ptp-dev@xxxxxxxxxxx,
<ecblank.gif>
    Date:
<ecblank.gif>
02/06/2013 04:09 PM
<ecblank.gif>
    Subject:
<ecblank.gif>
[ptp-dev] PTP Environment setup page for PTP 7.0 / Kepler started
<ecblank.gif>
    Sent by:
<ecblank.gif>
ptp-dev-bounces@xxxxxxxxxxx
_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/ptp-dev


GIF image

GIF image

Back to the top