search

symphonycms / markdown

Markdown Text Formatter for Symphony CMS
http://symphonyextensions.com/extensions/markdown/
Other
7 stars 12 forks source link

Fix compatibility info, release 1.2.1 #13

Closed michael-e closed 9 years ago

nitriques commented 9 years ago

I am happy if you pull this in :) Should it be released as well ?

michael-e commented 9 years ago

I won't pull this in, because I sent the request. I am a fan on the four-eye-principle.

Should it be released as well ?

I think so, yes. When it is pulled, we should also update master.

nitriques commented 9 years ago

I am a fan on the four-eye-principle.

Me too! That's why I checked it and just pulled it :smile:

nitriques commented 9 years ago

Should I rebase integration before pulling into master ?

nitriques commented 9 years ago

And I'd like to amend your commit, since it's 1.21, not 1.2.1 :smile:

michael-e commented 9 years ago

Shouldn't be necessary, because it is simply one commit ahead of master.

nitriques commented 9 years ago

Shouldn't be necessary, because it is simply one commit ahead of master.

Well it still made a merge commit... and as I just said, the commit message is wrong :P

michael-e commented 9 years ago

I don't think that one can correct my stupid commit message without messing things up. History will always remember from now on. :-(

nitriques commented 9 years ago

I don't think that one can correct my stupid commit message without messing things up

I sure can do!

git rebase -i 357496e
# amend the commit message
git push origin integration --force

And we won't loos anything

michael-e commented 9 years ago

Ah, using "the force" it is possible, of course. But I never dare to do this on public repos, because other people might have problems with that. You are basically destroying history if you --force.

I don't mind the merge, BTW. But changing the commit message might indeed be a good idea in this case.

Sorry for the inconvenience.

nitriques commented 9 years ago

You are basically destroying history if you --force.

Nope, history is still preserved: The new commit is still related to the old one with the commit message and the commit is still in the .git directory: just not in the tree anymore.

Using --force on public repro should always be avoided when possible. When in master branch, it should be avoided at all cost since it break git pull. But on a integration branch, when both of us are the only one which will have a broken git pull, I do not find it that dangerous.

Sorry for the inconvenience.

No worries.

nitriques commented 9 years ago

All done.

michael-e commented 9 years ago

I was on my way to push the lost (1.21) tag, but now I've seen that you did it in the meantime.

Thanks a lot, @nitriques!

nitriques commented 9 years ago

My pleasure !