0

I have the following situation, and I may know why it is happening but I'm not sure. I think it relates to this thread here. What I want to know is how to avoid it in the future, which I'm guessing maybe can be accomplished with a change in workflow.

I pulled the most recent develop branch then merged in my incomplete feature branch so another developer could access my current changes upon pushing develop back out to the server. When doing the merge, I purposely left out some files that were specific to my feature branch which I didn't want in develop.

Now, let's say there are more changes made to develop that I want in my feature branch. So, I pull those changes into my local develop branch. But, if I rebase my feature branch onto develop (or merge develop into my feature), it removes the files from my feature branch which I omitted initially.

My initial thought is if I had pulled develop and rebased my incomplete feature branch (or merged develop into my feature branch) before merging the feature branch into develop, I could have avoided this issue. Is that the case? If not, directions on how to keep files in a feature branch, while applying develop branch updates to that feature branch would be great.

Community
  • 1
  • 1
gfree
  • 479
  • 7
  • 16
  • When you say "purposefully left out some files", do you mean the files were were originally in commits on your feature branch but you removed the files from those commits when you merged your branch into `development`? – Shaun O'Keefe Feb 11 '14 at 22:45
  • Bob, yes that is correct. They were commits to my feature branch but they don't serve any purpose for the overall application. Some "try this way" and "try that way" testing files that I want to leave for reference in my feature branch but will just clutter up the develop branch. – gfree Feb 12 '14 at 17:36

0 Answers0