Don't send us your merge commits; Rebase then away, or: On Tue, Oct 19, 2010 at 8:35 AM, Phillip Moore <[email protected]> wrote: > This doesn't look right... > pmo...@renegade$ git push ssh://gerrit.openafs.org/openafs.git > HEAD:refs/for/master > Counting objects: 16, done. > Delta compression using up to 2 threads. > Compressing objects: 100% (7/7), done. > Writing objects: 100% (7/7), 1.17 KiB, done. > Total 7 (delta 4), reused 0 (delta 0) > New Changes: > http://gerrit.openafs.org/3003 > http://gerrit.openafs.org/3004 > http://gerrit.openafs.org/3005 > To ssh://gerrit.openafs.org/openafs.git > * [new branch] HEAD -> refs/for/master > That should have been one simple change, but before creating the topic > branch, I think (I'm not sure -- I did this a few days ago) I just did "git > pull" to update my copy of master.
git fetch; git checkout origin/master; git cherry-pick (your change) is one way. > Was that the wrong way to stay in sync? Am I supposed to be using rebase > instead? that also works. > Looking at gerrit, two of those "changes" are empty, and the most recent one > has the fs getfid patch I thought I was submitting. > Can someone let me know what I did wrong, so I can avoid the same mistake in > the future? -- Derrick _______________________________________________ OpenAFS-devel mailing list [email protected] https://lists.openafs.org/mailman/listinfo/openafs-devel
