On Wed, 28 Jan 2009 21:02:42 +0100 Francesco Poli wrote: > On Tue, 27 Jan 2009 14:59:10 +0900 Junichi Uekawa wrote: [...] > > I think you will get conflicts in the master branch that way, because > > I may have modified your patch when merging into my repository. > > You are right! I think I already explained I am a git novice... > > > > > You may want to use feature branches; > > Mmmmh, topic branches could be a solution. > OK, restarting from scratch, I could do as follows: > > $ git clone git://git.debian.org/git/apt-listbugs/apt-listbugs.git > > then, inside the repository directory: > > $ git checkout -b $MY_COOL_BRANCH_NAME origin > $ vim onefile > $ vim anotherfile > $ git add onefile anotherfile > $ git commit > $ vim thirdfile > $ vim anotherfile > $ git add thirdfile anotherfile > $ git commit > $ git format-patch origin -o somedirectory/ > > And then I could send the patch series to you via e-mail... > After some time: > > $ git checkout master && git pull # this should result in a fast-forward > > If the patches have been applied to the public repository, > then the branch may be discarded: > > $ git branch -d $MY_COOL_BRANCH_NAME > > In order to create another topic branch: > > $ git checkout master && git pull # this should result in a fast-forward > $ git checkout -b $SECOND_BRANCH_NAME origin > > and so forth similarly to $MY_COOL_BRANCH_NAME ... > > Is that correct?
Junichi, could you please confirm that the above strategy is a working one? May I proceed like this? -- On some search engines, searching for my nickname AND "nano-documents" may lead you to my website... ..................................................... Francesco Poli . GnuPG key fpr == C979 F34B 27CE 5CD8 DC12 31B5 78F4 279B DD6D FCF4
pgpPUEeURb4GZ.pgp
Description: PGP signature
