When using GitFlow in SourceTree, what is the best practice for rebasing features from develop?

Question

Typically, I'm working with a small feature that only one developer is working on.  If a change to develop occurs, I would like to rebase with those changes.  The only part of this that bother me is that I also like to push my feature to remote (in case my computer goes down).  This now forces me to do a forced push if I rebase.

What is the best practice for allowing rebases but also not storing your code locally only?

Duane Murphy · Answer

You have hit on a couple of ideas for how to approach the problem. I prefer rebasing to merging because rebasing gives you the opportunity to make a clean history. (A clean history is important to those of us who have to do software archaeology.)

However, as you're aware, pushing a rebased branch that has already been pushed can cause problems.

Here are some choices:

* If you are working alone on the branch, then a force push isn't horrible. I do this myself. 
* Create a new branch. The general recommendation we make to the team, is that rebase is fine, but you are creating a new branch. We version the branch name. For example, feature/new-coolness becomes feature/new-coolness-v1. The rebase process really is creating a new branch.
* Fork the repo. Do all of you work in another repo. You can mess around with history all you want in a private forked repository. 
 When you're ready, rebase across repos and push your lovely final product.

Each solution has advantages and disadvantages. For example, will your automated build and test system still function on a forked repo?

These are some solutions that we have used.

Seth · Answer

Sure. Leave the question open for now, and maybe someone else will disagree with me and provide you with a more useful answer.

Seth9 · Answer

It definitely would still accomplish the end goal.  I like rebase when local only for two reasons: 1) Keeps the tree cleaner and easier to follow 2) IMO it is easier to manage merge conflicts since you deal with each commit individually  Just interested in other perspective in similar situations.  Thanks!