2008/6/22 Rune Zedeler <[EMAIL PROTECTED]>:
> Will people having pulled from me up to a point before the merge (i.e.
> before the new dev/rune differs from the old dev/rune) be negatively
> affected by this, or will it only be a problem for the ones having pulled
> after the merge?
I'm not sure a
Hi,
On Sun, 22 Jun 2008, Rune Zedeler wrote:
> Johannes Schindelin skrev:
> > FWIW the proper way to undo a merge is to
> >
> > $ git rebase --onto MERGE_HEAD^ MERGE_HEAD
> >
> > where MERGE_HEAD has to be substituted by the merge commit that you
> > want to undo. (This command transplants t
John Mandereau skrev:
Should I "push -f" ?
IIRC this is not allowed on git.sv.gnu.org. If you really want to do
this (it seems to be the case, although I didn't catch all details of
the story), delete dev/run on git.sv.gnu.org
git push ssh://[EMAIL PROTECTED]/srv/git/lilypond.git :dev/rune
t
Johannes Schindelin skrev:
FWIW the proper way to undo a merge is to
$ git rebase --onto MERGE_HEAD^ MERGE_HEAD
where MERGE_HEAD has to be substituted by the merge commit that you want
to undo. (This command transplants the commits you did since the merge
onto the commit which was cu
Hi,
On Sat, 21 Jun 2008, Rune Zedeler wrote:
> Valentin Villenave skrev:
>
> > When I merged your branch several weeks ago I didn't encounter any
> > problem. So I must have screwed up something when you asked me to
> > revert this merge...
>
> I do not think you did anything wrong. My guess i
"Valentin Villenave" <[EMAIL PROTECTED]> writes:
> What's most annoying is that a merge is actually hard to revert.
Hm? Do a checkout of the version before the merge, make a soft reset to
HEAD again and recommit. Something like that.
--
David Kastrup, Kriemhildstr. 15, 44793 Bochum
___
2008/6/21 Rune Zedeler <[EMAIL PROTECTED]>:
> After all, I was the one who suggested that you tried and merge master into
> my branch on your local repos.
I really needed *both* your code and the new features/bugfixes from
latest 2.11 releases... :-)
> I would probably have made the same mistake
Valentin Villenave skrev:
I must be the one to blame here (even though I don't know why).
No, surely not.
After all, I was the one who suggested that you tried and merge master
into my branch on your local repos.
I would probably have made the same mistake at some point if I was
working on so
On 2008/06/20, Rune Zedeler wrote:
> Unfortunately I ofcourse cannot push onto origin - (error: remote
> 'refs/heads/dev/rune' is not a strict subset of local ref
> 'refs/heads/dev/rune'.)
>
> Should I "push -f" ?
IIRC this is not allowed on git.sv.gnu.org. If you really want to do
this (it se
Rune Zedeler skrev:
$ git rebase -i --onto remotes/dev/rune2 HEAD~15
Sorry for the noise, my git is too old (1.5.2.5).
It worked with rebase -v - now my dev/rune actually looks perfect - the
merge gone and all :) Thanks for helping!
Unfortunately I ofcourse cannot push onto origin - (er
Rune Zedeler skrev:
$ git branch dev/rune2 HEAD~6
whoops, should be HEAD~5^2
Well, it gives the same error.
-Rune
___
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel
Johannes Schindelin skrev:
Hmm, perhaps the best thing is to branch off a new branch (dev/rune2)
just before the merge, and then cherry-pick the commits I did after the
revert...?
This would be a rebase.
Basically, you have to find out what the relationship is between the two
branches you ar
Hi,
On Fri, 20 Jun 2008, Rune Zedeler wrote:
> Valentin Villenave skrev:
> > Yes, AFAICR I did it all by the book. Mainline is the branch you want
> > to come back to, I think.
>
> Ok, in that case I see no point in reverting and trying again.
> The result should be the same.
>
> Hmm, perhaps t
Valentin Villenave skrev:
Yes, AFAICR I did it all by the book. Mainline is the branch you want
to come back to, I think.
Ok, in that case I see no point in reverting and trying again.
The result should be the same.
Hmm, perhaps the best thing is to branch off a new branch (dev/rune2)
just bef
2008/6/20 Rune Zedeler <[EMAIL PROTECTED]>:
> How did you revert?
There's only one way to revert a merge if IIRC...
> Did you specify a mainline ("git revert --mainline 1" or "git revert
> --mainline 2") ?
> I do not understand what the mainline argument is doing, but it appears that
> it should
Valentin Villenave skrev:
As it has been 9 months since i branched off dev/rune I tried to merge
master into dev/rune to test how it went.
And then I was flooded with conflicts.
I must be the one to blame here (even though I don't know why).
How did you revert?
Did you specify a mainline (
2008/6/20 Rune Zedeler <[EMAIL PROTECTED]>:
> As it has been 9 months since i branched off dev/rune I tried to merge
> master into dev/rune to test how it went.
> And then I was flooded with conflicts.
I must be the one to blame here (even though I don't know why).
When I merged your branch seve
On Fri, 20 Jun 2008 02:48:06 +0200
Rune Zedeler <[EMAIL PROTECTED]> wrote:
> Rune Zedeler skrev:
> > (I branched off from 7cfd1d6da86bf8c2eb6391592c84ea361c35ca6d. I
> > have only changed 24 files. After pull master I had conflicts in
> > almost all files.)
>
> More specifically: I had conflicts
Rune Zedeler skrev:
(I branched off from 7cfd1d6da86bf8c2eb6391592c84ea361c35ca6d. I have
only changed 24 files. After pull master I had conflicts in almost all
files.)
More specifically: I had conflicts in 334 files.
-Rune
___
lilypond-devel mail
As it has been 9 months since i branched off dev/rune I tried to merge
master into dev/rune to test how it went.
I did
$ git checkout dev/rune
$ git pull --no-commit . master
And then I was flooded with conflicts.
Many conflicts was in files that I did not even change.
How could this happen, an
20 matches
Mail list logo
