On Sun, 2013-06-02 at 08:32 -0700, Sam Roberts wrote:
> If the tests run before the merge into master, then the normal
> procedure is that after you know the branch tests pass, you rebase
> your-feature to clean it up, and do a "push -f" to overwrite it. Then
> people comment, maybe you rewrite aga
Paul, your story is confusing.
Server:
master
your-feature (tests run on it)
If the tests run before the merge into master, then the normal
procedure is that after you know the branch tests pass, you rebase
your-feature to clean it up, and do a "push -f" to overwrite it. Then
people comment, may
On Thu, May 30, 2013 at 09:32:07PM -0400, Paul Smith wrote:
> Hi all.
>
> I run across this problem quite a bit: I have a branch that I'm
> working on. Unfortunately for me, in order to get my code tested
> and built by our build servers and infrastructure (which is a
> requirement before it can
On 2013-05-31, at 2:32, Paul Smith wrote:
> [...]
>
> I DO want to do the cleanup before merging to master. If you mean do
> the cleanup before pushing to the git repo, I can't do it all because
> it's not until after I push that I can detect build issues on platforms
> I don't have access to,
>
> Then if I merge my branch into the master branch, all that
> becomes part of the mainline of the code.
Do you *need* to merge into the master branch to build your code? If
possible, a much better way to do this would be to push the
work-in-progress branch to the remote, build and test it on t
On Thu, 2013-05-30 at 22:29 -0700, PJ Weisberg wrote:
> On May 30, 2013 6:32 PM, "Paul Smith"
> > However, I've already pushed my branch to master. I know rebasing stuff
> > you've already pushed is considered a no-no in general, but I can't
> > avoid it. Does anyone have suggestions for how t
On May 30, 2013 6:32 PM, "Paul Smith"
> However, I've already pushed my branch to master. I know rebasing stuff
> you've already pushed is considered a no-no in general, but I can't
> avoid it. Does anyone have suggestions for how to make this work
> better? Should I be rebasing to a brand new
Hi all.
I run across this problem quite a bit: I have a branch that I'm working
on. Unfortunately for me, in order to get my code tested and built by
our build servers and infrastructure (which is a requirement before it
can be code reviewed and merged, plus it builds my code on platforms I
don't
