On 15/11/13 20:24, Kornel Benko wrote: > I probably misunderstood, what to send.
it was ok. I just wanted to check whether your origin was actually the main lyx repo or mine, so you actually must have cloned the whole repo developers/tommaso as an independent folder (calling it as origin), that's fine. I guess it's all right from your side. The one to blame is just me, as I've been keeping features/chat2 clean and rebased on top of master (a.k.a., lyx trunk). As I have "rebase=true" for this branch in my .git/config, it rebases every time I pull, but then I also needed push -f quite a number of times, even though I don't do that unless I double-checked there are no other commits from you on the repo (in which case I pulled these commits in my local branch before pushing). As Vincent pointed out, rebase rewrites the history, so it creates problem to whoever wants to follow the branch with a simple pull/merge. However, still it should be able to follow the branch with some additional reset. The ideal behaviour should be refraining entirely from pulling additional patches from trunk (origin/master), but keeping developing features/chat2 on top of the point where it branched (or where it's been rebased so far), without pulling any further patches, but finishing it, then ask a merge of it into trunk. Kind of guidelines also quite clear from, e.g.: http://lwn.net/Articles/328436/ however, as it's the first time I'm publishing the patch updates through a git branch (and don't know about others who also committed some patches there), rather than sending the patch by e-mail or attaching it to a ticket, this is all being a new and learning experience. T.
