Re: [AUCTeX-devel] [PATCH v3]: Merge /preview/ into top-level

[Tassilo Horn]

"Davide G. M. Salvetti" <address@hidden>
writes:

> TH> Thus history is modified and I couldn't push my branch except with
> TH> --force which would invalidate the branches people have based on
> TH> my one.
>
> If I know you will rebase your branch, I'll either avoid basing my own
> branch on your branch

That's not acceptable.  I want you to fix my bugs!  That's the whole
reason why it's a public branch and not just a local branch on my
machine. ;-)

> or accept the burden of recovering from upstream rebase.

Out of interest: how would you do that?  Say, HEAD was commit foo, you
added a bar commit on top, and now upstream has rebased so that foo is
gone and the new upstream HEAD is quux.

> Therefore, I'd suggest to declare that you will rebase the branch in
> README.GIT

Do you really think anybody reads that except after running into
troubles? ;-)

> and then just rebase and push.

Well, but isn't it better in this case that I just merge master into my
branch as I've done now and live with the merge commits?  Then others
can also fix bugs as they encounter them.  And if want to merge my
changes into master at some point, I just apply the diff manually or do
a final rebase on my local branch and merge that.

In the end, I'd probably delete the upstream branch so that nobody
builds upon that anymore.  (Or is there a git counterpart of mercurial's
hg commit --close-branch?)

Bye,
Tassilo