How to update my working Git branch from another branch (develop)?

You just merge develop to feature1:

git checkout feature1
git merge develop

There is no need to involve another branch such as master.

First you need to update your develop branch, then checkout your feature and merge/rebase it.

git checkout develop
git pull
git checkout feature/myfeature

Now you can decide between running:

git merge develop
git rebase develop

• merge: keeps all commits history from your branch, and that is important if your partial commits have a lot of content that can be interesting to keep.

• rebase: Rebase means deleting the commit history from feature and instead have the history from develop; this option is obligatory in some teams.

When you are ready you can push to your own branch (for example for a pull request)

git push origin feature/myfeature

BRANCHS:

DEV ====> develop

feature1 ====> working

STEP 1 GIT SENDING FROM THE SITE

checks the branch you're syncing

git status

add files for the commit

git add .

commits with a description

git commit -m "COMMENT"

send to the branch that you are synchronized

git push

STEP 2 SYNCHRONIZING THE UPDATED WORK BRANCH WITH DEV (development) - synchronizes the working branch with the development branch (updates the development branch)

synchronize with the remote and switch to the DEV branch

git checkout DEV

request to merge the branch that you are syncing with the feature1 branch

git merge feature1

Merge the current branch with the feature1 branch

git push

STEP 3 GIT FINDING THE REMOTE - Update the working branch from the updated development branch

connects to the reference branch

git checkout DEV

Search changes

git pull

Syncs with your work branch

git checkout feature1

request to merge the branch that you are synchronized with the DEV branch

git merge DEV

Merge the current branch with the DEV branch

git push

This use case is very helpful to keep updated your PR branch. Firstly, I would recommend you to fetch first your remote changes, i.e. git fetch and then merge or rebase from develop, but from the remote one, e.g.

git rebase -i origin/develop

or

git merge origin/develop

This way you will update your PR branch without going back and forth between branches.

To avoid having the commits from develop by using a simple merge, i've found that the easier (less techier) way to do it is specially if you already pushed:

1. Change to develop and be sure you pulled latest changes
2. Create another branch from develop , feature1_b
3. Merge feature1 to feature1_b
4. Delete if you wish original feature1

So when you do your PR of feature1_b into develop, it will only have your new changes and not the whole history of commits.

If you haven't pushed then @stackdave's answer is a good answer.

$ git checkout <another-branch> <path-to-file> [<one-more-file> ...]
$ git status
$ git commit -m "Merged file from another branch"

1. git checkout develop
2. git pull 3.git checkout localbranch

Then run merge or rebase based on your requirements

1. git merge develop
2. git rebase develop

If you don't want that the develop head and the feature1 head will merge both into feature1, but instead you want keeping each branch head distinct while "updating" feature1 branch with the latest edit from develop, use no fast-forward:

git pull
git co feature1
git pull
git merge --no-ff develop
git push

I personally try to use --no-ff everytime I perform a merge because in my opinion it keeps the history quite clean.

I have found the solution. Checkout the previous branch and pull the new branch https://stackoverflow.com/a/71306254/17779236

In IntelliJ IDEA just follow these steps:

1. open the Git Tool Window (View->Tool Windows->Git)

2. select "Log"

   

3. right click on "develop"

4. click on either

   -Merge 'develop' onto 'feature1' (keeps all commits history from your branch)

   or

   -Rebase 'develop' into 'feature1' (delets the commit history from your branch and instead have the history from develop)

   

5. Finally Git push