From: Boris Grozev [mailto:firstname.lastname@example.org]
Hey Boris, all devs
I'm a bit confused (and worried) about the "Merge branch 'master' of
github.com:jitsi/jitsi" commits repeatedly appearing in the master
I don't know git to well either, but my guess is that some of you are
committing locally to the master branch, then pulling which causes a
I'm confused as well. I assumed pulling was a safe thing to do...
git pull is actually two actions: 'git fetch' followed by 'git merge'. While
fetch is always safe to do, merge obviously isn't.
Never tried this, but I _think_ you could still commit on master (avoiding
topic branches for small stuff) by doing:
- commit on master
- git fetch
- git rebase FETCH_HEAD
I also see that a Pootle was involved in the last message, so this
also contributes to the confusion. But I don't get why Boris should have
committed a Pootle-change from Emil?
So in order to avoid that strange stuff, could please all of you pay
attention what you were doing before pushing and post the results here
it happens again?
I have no idea what caused the pootle commit.
I *think* what I did today was this: tried to pull from github into my
'jingle' branch, which didn't work.
This can't work because a local branch is mapped to master, it has no origin
to pull from. It shouldn't cause any harm though.
Pulled into local master (which wasn't clean and maybe caused a merge).
I guess you were on 377fa5cfa3, pulled, which somehow created the weird
d661093fff (Pootle authored by Emil), followed by 0624917501 (the first
Cleaned local master.
Whatever that was is either the merge 0624917501 or not visible in public.
Merged 'jingle' into local master.
Went clean I guess, probably a fast-forward and the 3 newest commits at the
time of writing.
Pulled again, because you'd made a commit.
This created 935e272fdf. It seems we'd need to create a policy how to handle
merges on the master-branch as situations like this are unavoidable.
- Allow them: not nice for the history (but shouldn't cause harm)
- Forbid them: don't push and resolve again (undo the merge of the pull and
the topic branch, pull (should then be a fast-forward), merge topic again,
I could remember incorrectly, though.
Apart from the strange pootle commit, this all makes sense.
On Sat, May 4, 2013 at 8:00 PM, Ingo Bauersachs <email@example.com> wrote: