Where communities thrive


  • Join over 1.5M+ people
  • Join over 100K+ communities
  • Free without limits
  • Create your own community
People
Repo info
Activity
    Stefano Zaghi
    @szaghi
    ok
    Izaak "Zaak" Beekman
    @zbeekman
    one second still looking…
    so it seems that the histories for v0.6.0 and for origin/master are different
    Stefano Zaghi
    @szaghi
    yes I think so
    Izaak "Zaak" Beekman
    @zbeekman
    if you checkout v0.6.0 and run your git hist and then look at master and run your git hist the commit SHA hashes are different, and there is an extra commit in v0.6.0: 333979abcbf2b2bf6d5059846b720b0752ca2f43
    “Merge pull request #42 from zbeekman/small-docs-simplification"
    Stefano Zaghi
    @szaghi
    yes
    what happens if in my master I recreate a tag v0.6.0?
    Izaak "Zaak" Beekman
    @zbeekman
    is v0.6.0 supposed to be the same as origin/master right now?
    Stefano Zaghi
    @szaghi
    yes I suppose so
    no... now .gitignore is versioned!
    on both master and origin/master
    and if now create a tag v0.6.1 and push to origin/master?
    Izaak "Zaak" Beekman
    @zbeekman
    haha sorry… I messed you up with that… hold on one moment
    if you think only you and I are the ones using FLAP at the moment
    and since v0.6.0 is so new
    we could re-write possibly…
    Stefano Zaghi
    @szaghi
    sure we are the only poor flap-men :-)
    Izaak "Zaak" Beekman
    @zbeekman
    I’m trying to figure out how to see what the difference is, if any, between origin/master and v0.6.0
    it’s possible that there is no real difference, but that the commit SHA hashes are different because of the discrepancy with the merge commit. If that is the case then it should be safe to re-write the tag after rebasing it onto master… hold on few more minutes I am researching how to compare master with the tag
    Stefano Zaghi
    @szaghi
    many many thanks!
    Izaak "Zaak" Beekman
    @zbeekman
    OK, well I’m having a little bit of trouble understanding what went wrong, but as far as I can tell, master and v0.6.0 are the same
    Stefano Zaghi
    @szaghi
    ok
    Izaak "Zaak" Beekman
    @zbeekman
    and if you’re 100% certain that master looks correct, and you want the tag v0.6.0 to look like master then this is what you can do to overwrite the tag
    Stefano Zaghi
    @szaghi
    Perfect
    I am trying
    Izaak "Zaak" Beekman
    @zbeekman
    this will overwrite v0.6.0 which if anyone besides us is using it could cause them problems
    so first follow these instructions to delete the GitHub release associated with v0.6.0
    after you’ve done that delete the v0.6.0 tag from the remote (GitHub) repository with git push origin :refs/tags/v0.6.0. This will delete the tag on GitHub
    Stefano Zaghi
    @szaghi
    done!
    it works!
    thank you!!!!!!
    now I can merge your PR?
    Izaak "Zaak" Beekman
    @zbeekman
    then make sure you’re on the master branch and everything is up to date, and that the current master branch is what you want to tag as v0.6.0 If you’re happy that this looks right, and you’re on the master branch then run git tag -af v0.6.0 followed by git push origin master --tags
    Stefano Zaghi
    @szaghi
    already done
    origin and local master are synked
    Izaak "Zaak" Beekman
    @zbeekman
    if it pushes correctly, then the strange v0.6.0 tag should be overwritten to match origin/master as it stands now… then you can merge my PR etc…
    Stefano Zaghi
    @szaghi
    ok
    ari-thanks... (Italian slang...)
    Izaak "Zaak" Beekman
    @zbeekman
    ok great… hopefully that sorted it out. something strange must have happened when trying to merge PR #42
    Stefano Zaghi
    @szaghi
    yes
    I have to go home, see you tomorrow (I will fix the man page bug)
    Izaak "Zaak" Beekman
    @zbeekman
    ok, thanks for a great project
    everything looks good, I double checked your work on github
    have a good afternoon/evening
    Stefano Zaghi
    @szaghi
    evening... no your help is great! ooo, a personal question: you know Rouson?
    I am studing his book on OOP, it is great!
    see you
    victorsndvg
    @victorsndvg
    Hello, congrats for the great job during the last days! :+1: I hope to do the integration of FLAP into my project as soon as possible and start to help you
    Stefano Zaghi
    @szaghi
    Hi victor, Indeed I have very few times for working to my codes... the "official" work is very busy. I have not yet found the time to go on with Lib_VTK_IO, I am sorry.