[Pkg-protobuf-devel] Git workflow

[Andrew Pollock]

Hi,

Okay my next problem now is one of workflow. As the gRPC folks can attest,
my Git-fu is weak. Couple that with the pkg-protobuf Git repository
structure being completely differently structured to gRPC's, and I feel like
a total fish out of water.

I've read
http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.html,
which didn't really help all that much.

What I want to do first of all is update the upstream source to what's
tagged in the upstream repository with v3.0.0-beta-1

I want to keep this in a separate branch so if any modifications need to be
made to the 2.6.1 packaging in the meantime, that's still a possibility.

I thought this could just be a case of making a new branch based off the
current upstream branch, adding a new remote repository for upstream's
github repo and then pulling the v3.0.0-beta-1 into this branch.

Something along the lines of:

git remote add realupstream https://github.com/google/protobuf.git
git checkout -b upstream_v3.0.0-beta-1 upstream
git pull realupstream v3.0.0-beta-1

But when I tried that, I got into a terrible mess with merge conflicts.
Maybe that was the right thing to do, and I just don't know how to merge
properly. Hopefully someone else here can provide some advice.

regards

Andrew
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-protobuf-devel/attachments/20151105/5cf5d894/attachment.sig>