Honestly, I would simply make a new branch, put my stuff there and leave it. I assume that your current local copy has been pulled and is recent. Munging git around to do what you want seems like an awful lot of work and at least some minimal risk. Were I you, I would rather work on the project itself than on patching things together in git. But that is just me. I guess it would depend on the ROI expected.

You probably already know this, but I would certainly standardize on one system of version control. As long as you have a git server set up, it seems to me like that is the way to go. I worked for a time at a large insurance company where the developers were using svn, the test team cvs, and the other groups up the RUP ladder were using Harvest. Not a good situation, particularly since it was a huge project and a huge team. We finally got it down to svn and Harvest (Harvest had upper management behind it). I ended up writing the bridge between svn and Harvest. It would have been so much better had we simple been able to rely on a single system!

Anyway, anecdotes aside, I thought I would toss in my $0.02 worth. While it would be great to go through the exercise and learn more about git, I would ask the ROI question.

Best of luck with your project!

...the majority is always wrong, and always the last to know about it...

A solution is nothing more than a clearly stated problem...

wjw

In reply to Re: [OT] complex GIT merging by wjw
in thread [OT] complex GIT merging by LanX

Title:
Use:  <p> text here (a paragraph) </p>
and:  <code> code here </code>
to format your post, it's "PerlMonks-approved HTML":


  • Posts are HTML formatted. Put <p> </p> tags around your paragraphs. Put <code> </code> tags around your code and data!
  • Titles consisting of a single word are discouraged, and in most cases are disallowed outright.
  • Read Where should I post X? if you're not absolutely sure you're posting in the right place.
  • Please read these before you post! —
  • Posts may use any of the Perl Monks Approved HTML tags:
    a, abbr, b, big, blockquote, br, caption, center, col, colgroup, dd, del, details, div, dl, dt, em, font, h1, h2, h3, h4, h5, h6, hr, i, ins, li, ol, p, pre, readmore, small, span, spoiler, strike, strong, sub, summary, sup, table, tbody, td, tfoot, th, thead, tr, tt, u, ul, wbr
  • You may need to use entities for some characters, as follows. (Exception: Within code tags, you can put the characters literally.)
            For:     Use:
    & &amp;
    < &lt;
    > &gt;
    [ &#91;
    ] &#93;
  • Link using PerlMonks shortcuts! What shortcuts can I use for linking?
  • See Writeup Formatting Tips and other pages linked from there for more info.