Beefy Boxes and Bandwidth Generously Provided by pair Networks
Your skill will accomplish
what the force of many cannot

comment on

( [id://3333] : superdoc . print w/replies, xml ) Need Help??

I am maintainer of a CPAN distribution whose most recent official release is version 2.12.

Since 2.12 was published, we have made the following development releases:

2.12_001 2.12_002 2.12_003 2.12_004
In the git repository, we have tags for:
2.12_002 2.12_003 2.12_004
(Somehow 2.12_001 was overlooked or has not yet been set.)

I now realize that much of the code (mostly tests, but some source) added in 2.12_003 and 2.12_004 is conceptually flawed. For other developers and myself to treat 2.12_004 as the starting point for future development would not be fruitful.

What I would like to do is to go back to 2.12_002 and start development anew from there -- but without pretending that 2.12_003 and 2.12_004 were never released. I would like 2.12_005 to be equivalent to 2.12_002 but with only very safe, minor touchups.

Would the following be the recommended sequence of git commands?

$ git checkout master $ git checkout -b start-anew $ git reset --soft 2.12_002 $ git commit -m "Rewind to tag 2.12_002" # hack, hack, hack $ git add ... $ git commit -m "Slight touchups to what was 2.12_002" $ git checkout master $ git merge start-anew $ git tag "2.12_005"
Thank you very much.
Jim Keenan

In reply to What is best practice for 'git reset'? by jkeenan1

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

  • Are you posting in the right place? Check out Where do I post X? to know for sure.
  • Posts may use any of the Perl Monks Approved HTML tags. Currently these include the following:
    <code> <a> <b> <big> <blockquote> <br /> <dd> <dl> <dt> <em> <font> <h1> <h2> <h3> <h4> <h5> <h6> <hr /> <i> <li> <nbsp> <ol> <p> <small> <strike> <strong> <sub> <sup> <table> <td> <th> <tr> <tt> <u> <ul>
  • Snippets of code should be wrapped in <code> tags not <pre> tags. In fact, <pre> tags should generally be avoided. If they must be used, extreme care should be taken to ensure that their contents do not have long lines (<70 chars), in order to prevent horizontal scrolling (and possible janitor intervention).
  • Want more info? How to link or How to display code and escape characters are good places to start.