git problem with upstream branch (original) (raw)

hello mentors,

in the process of updating knopflerfish-osgi, I pulled the latest changes from master branch branch before adding my changes, but not from the upstream and pristine-tar branches (which contained upstream/5.2.0).

So when I tried to push the new upstream/6.1.1, I had to pull, and of course got merge conflicts (while pulling):

$ git push Enter passphrase for key '/home/felix/.ssh/id_rsa': To git+ssh://git.debian.org/git/pkg-java/knopflerfish-osgi.git ! [rejected] upstream -> upstream (non-fast-forward) error: failed to push some refs to 'git+ssh://fnatter-guest@git.debian.org/git/pkg-java/knopflerfish-osgi.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.

I aborted the merge, and ran: $ git pull --strategy=ours Merge made by the 'ours' strategy.

(in order to keep the upstream/6.1.1 changes and discard the upstream/5.2.0 changes) which seems to work.

The history is: $ git log -3 commit 8710f8e5d2b81805b82dc4a0f11d5dd20032a5a7 (HEAD -> upstream) Merge: b2511e0 0872330 Author: Felix Natter fnatter@gmx.net Date: Sat Sep 16 10:40:09 2017 +0200

Merge branch 'upstream' of git+ssh://git.debian.org/git/pkg-java/knopflerfish-osgi into upstream

commit b2511e0431fdc9acbd2895bac3702f863de0944e (tag: upstream/6.1.1) Author: Felix Natter fnatter@gmx.net Date: Sat Sep 16 10:05:50 2017 +0200

New upstream version 6.1.1

commit 08723308d93f5675b1092003bc512b492aa5abe2 (tag: upstream/5.2.0, origin/upstream) Author: Emmanuel Bourg ebourg@apache.org Date: Mon Oct 3 15:37:31 2016 +0200

New upstream version 5.2.0

$ git diff upstream/6.1.1..HEAD

The package builds, and I see: [...] gbp:info: Creating knopflerfish-osgi_6.1.1.orig.tar.xz from 'upstream/6.1.1' [...]

Regarding the pristine-tar branch, I just merged it without conflicts, of course.

I have pushed all branches here: https://anonscm.debian.org/cgit/pkg-java/knopflerfish-osgi.git

I think I am safe, did I miss anything?

Thanks and Best Regards,

Felix Natter debian/rules!

Reply to: