'GIT downloaded dev and branched to feature
I have one local dev branch coming from the origin master. I created a feature branch off of the local dev.
Did some work and pushed the feature up-stream back to origin. It now appears on the server branches.
However, now dev has had changes by other developers... so I did a git pull to my local dev branch, which is now sync-ed up to the server.
Now I need to get those changes into my feature from the local dev before I push feature back up to the origin server. (OR do I directly merge/pull/whatever from server dev into the feature).
Obviously Im confused.
Thanks in advance for you help/clarification.
Solution 1:[1]
If the idea is to update your feature branch to catch up with the current state of dev, then pull dev (you did that), switch to feature, and merge dev into feature.
Alternatively, if you have not pushed feature yet, you can pull dev (you did that), switch to feature, and rebase feature onto dev.
Sources
This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.
Source: Stack Overflow
| Solution | Source |
|---|---|
| Solution 1 | matt |