Reputation: 888
I have a branch (Let's call it X branch) that I have been working on that comes from my development branch. There have been quite a few changes in my development branch that are not in my X branch.
How do I get my X branch up-to-date with my development branch again?
Upvotes: 1
Views: 108
Reputation: 27496
If you prefer rebasing (to merge), assuming you are on your X branch:
git rebase develop
Upvotes: 0
Reputation: 1969
git checkout x
git merge development # Merges branch 'development' into branch 'x'
Upvotes: 3