> 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 the server,
perform any code review, then clean up the work-in-progress branch with an
interactive rebase, merge it into master, and push it to the central

If you're using a central workflow and your entire team is pulling from the
same master branch on a central repository, I would steer clear of rebasing
it. Even if you need to build remotely, you should still be able to follow
the standard Git workflow: develop in a dedicated feature branch, then
merge into the master branch when the changes are ready to be published.

Let me know if you have any questions.


You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to