RE:Trouble with git import-orig --pristine-tar

To: Andreas Tille <andreas@an3as.eu>, "debian-mentors@lists.debian.org" <debian-mentors@lists.debian.org>, Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
Subject: RE:Trouble with git import-orig --pristine-tar
From: PICCA Frederic-Emmanuel <frederic-emmanuel.picca@synchrotron-soleil.fr>
Date: Mon, 2 Mar 2015 21:37:58 +0000
Message-id: <[🔎] A2A20EC3B8560D408356CAC2FC148E53B1FF10B2@SUN-DAG3.synchrotron-soleil.fr>
In-reply-to: <[🔎] 20150302211827.GB13372@an3as.eu>
References: <[🔎] 20150302185726.GC9618@an3as.eu> <[🔎] 20150302191750.GA2756@belkar.wrar.name>,<[🔎] 20150302211827.GB13372@an3as.eu>

Hell andreas,

I have this kind of problem with git import-orig when I forgot to synchronize the upstream branch with the origin/upstream branch

this way the merge is done between master and your local upstream branch which is not the origin upstream branch.

cheers

Frederic

Reply to:

References:
- Trouble with git import-orig --pristine-tar
  - From: Andreas Tille <andreas@an3as.eu>
- Re: Trouble with git import-orig --pristine-tar
  - From: Andrey Rahmatullin <wrar@debian.org>
- Re: Trouble with git import-orig --pristine-tar
  - From: Andreas Tille <andreas@an3as.eu>

Prev by Date: Re: Trouble with git import-orig --pristine-tar
Next by Date: Re: Python logo license
Previous by thread: Re: Trouble with git import-orig --pristine-tar
Next by thread: Re: Trouble with git import-orig --pristine-tar
Index(es):
- Date
- Thread