Git Workflow for developing features using multiple branches

Question

I have an app that I've augmented with extra debugging features which make it easier for me to develop. However , I can't commit these changes. So I need a way to implement my feature on the "augmented" branch , and then when I'm finally done, push it to master.

There are the two workflows that I've found : -

Workflow # 1:

  1. Checkout augmented branch 
  2. Make changes
  3. Stash the changes
  4. Switch to master
  5. Apply the stash and resolve conflicts
  6. Commit and push to master

Workflow # 2:

  1. Checkout augmented branch
  2. Make changes
  3. Switch branches using git checkout -m
  4. Check everything is fine and commit to master

And for both the workflows I rebase changes from master onto the "augmented" branch so that everything stays upto date.

Are there any pitfalls I should be aware of ? Is there any better way ?

Answer 1

So I need a way to implement my feature on the "augmented" branch , and then when I'm finally done, push it to master.

That would be rebasing your " augmented_branch " regularly on top of master (since you are the only one working with that branch).

Once you have convinced the rest of the team of using your version, a merge to master will be a simple fast-forward merge.