butter_baby
butter_baby

Reputation: 888

How do I update my branch from my development branch?

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

Answers (4)

user6523164
user6523164

Reputation:

git checkout X
git merge branchname

Upvotes: 0

Twinkle
Twinkle

Reputation: 524

git checkout X
git rebase -i development

Upvotes: 0

Krzysztof Krasoń
Krzysztof Krasoń

Reputation: 27496

If you prefer rebasing (to merge), assuming you are on your X branch:

git rebase develop

Upvotes: 0

Anthony Astige
Anthony Astige

Reputation: 1969

git checkout x
git merge development  # Merges branch 'development' into branch 'x'

Upvotes: 3

Related Questions