Well, base on your situation, seems only thing you can do is use git-merge
to merge your branch back to master.
But since you're not a committer, so you cannot push (merged) master
directly. Some time people would create another remote repo and ask for
pull. But that's for very big changes mostly.
So...let's see...getting back to doing this now. :) I had to finish up
implementing comments from a code review.
Here is how I've been developing. Please let me know which option provided
to me in this e-mail chain best fits my situation. I can, of course, do
development in Git differently next re
Thanks, everyone!
Once I finish up implementing review suggestions, I can try again with
building a squashed patch file.
On Thu, Jun 13, 2013 at 8:41 AM, John Burwell wrote:
> Prasanna,
>
> +1 to using rebase on feature branches.
>
> At least as I understand things and have experienced rebase,
Prasanna,
+1 to using rebase on feature branches.
At least as I understand things and have experienced rebase, it
preserves all commits on the feature branch. For Review Board and
master merges, those commits need to be collapsed, or in git parlance,
squashed. The script I referenced below squ
The 'cleanest cleanest' way is to use rebase as Sheng recommends but I
know people who've used git successfully with just doing merge. It's
(rebase) one of those features of git you discover only after
using-abusing it for long enough. But if you're adventurous .. :)
Do NOT do a rebase if you've
Mike,
The cleanest way have found to create these patches is actually create a
temporary work branch from master, merge the feature branch into it with the
squashed option, and then generate the patch. This gist
(https://gist.github.com/jburwell/5771480) is the shell script I used to
generat
I use "git diff master" and "patch -p1 <*.patch" to generate and apply the
patches.
2013/6/13 Sheng Yang
> You should use git-rebase rather than git-merge if the patches are in
> relatively small numbers. I doubt git-format-patch would get the correct
> result if your patches are not the top co
You should use git-rebase rather than git-merge if the patches are in
relatively small numbers. I doubt git-format-patch would get the correct
result if your patches are not the top commits.
So you maybe want:
git checkout master
git pull
git checkout solidfire_plugin
git rebase master
git format
I have a branch, solidfire_plugin, off of master in my local repo.
I wanted to submit a patch to Review Board.
Essentially, I followed these steps (where upstream is the official CS
repo):
git checkout master
git fetch upstream
git reset --hard upstream/master
git checkout solidfire_plugin
g
