psykx
Reputation: 293
How can I avoid fixing other peoples merges when doing a git rebase
I'm working a huge feature that can't be released in parts so I'm working on a feature branch. Every few weeks or so I try and do a rebase to keep myself up to date with dev.
The bit of code I'm working is nicely separated from the rest of the code so why do I end up having to re-fix merges that have already been made on the branch I'm rebasing from?
What's likely happening? What do we change to stop it happening?
Upvotes: 1
Views: 42
Answers (0)
Related Questions
- When do you use Git rebase instead of Git merge?
- How to avoid having to do "git branch --set-upstream", and instead default to automatically setup remote tracking?
- How can I rename a local Git branch?
- How can I save username and password in Git?
- How can I git stash a specific file?
- How can I delete all of my Git stashes at once?
- When should I use git pull --rebase?
- How can I reconcile detached HEAD with master/origin?
- How can I see the changes in a Git commit?
- Git workflow and rebase vs merge questions