Deploying from #Git branches adds flexibility. Bring your feature branch up to date with master and deploy it to make sure everything works. If everything looks good the branch can be merged. Otherwise, you can deploy your master branch to return production to its stable state.

Update-branch.md

Updating a feature branch

First we'll update your local master branch. Go to your local project and check out the branch you want to merge into (your local master branch)

$ git checkout master

Fetch the remote, bringing the branches and their commits from the remote repository. You can use the -p, --prune option to delete any remote-tracking references that no longer exist in the remote. Commits to master will be stored in a local branch, remotes/origin/master.

$ git fetch -p origin

Merge the changes from origin/master into your local master branch. This brings your master branch in sync with the remote repository, without losing your local changes. If your local branch didn't have any unique commits, Git will instead perform a "fast-forward".

$ git merge origin/master

Check out the branch you want to merge into

$ git checkout <feature-branch>

Merge your (now updated) master branch into your feature branch to update it with the latest changes from your team.

$ git merge master

Depending on your git configuration this may open vim. Enter a commit message, save, and quit vim:

1. Press a to enter insert mode and append text following the current cursor position.
2. Press the esc key to enter command mode.
3. Type :wq to write the file to disk and quit.

This only updates your local feature branch. To update it on GitHub, push your changes.

$ git push origin <feature-branch>

Great, That got it. Thank you so much!

Hopefully this won't happen again.

During "git merge master" step,
I got conflict. I resolved the conflict by editing the files.
After that, How do i restart the merge process?

Once you resolve the merge conflict, it should automatically let you merge it in. No action should be necessary other than pressing the 'merge' button.

@msureshbe - you just create a new commit. This is what git tells us to do - when you'd type in git status you'd see (use "git commit" to conclude merge)

helped a lot.. thanks 👍

That helped, thanks.

This was very useful for me today, thank you.

Thank you very much, this helped me out a lot today

Really you're awesome

Since a feature branch is only controlled (hopefully) by 1 developer, I find it more effective to rebase instead. This ensures some things:

1. Developer is aware of the deltas between his branch and master.
2. The feature branch will be almost a "fresh copy".

  git checkout {branch}
  git fetch origin
  git rebase origin/master
  {fix w/e needs fixing}

Furthermore, you can do more cool stuff with rebase --interactive, like pluck, merge, rename and much more to your commits.

  git rebase origin/master -i

Can you do this online using github.com? It is too much typing in a terminal.

Can you do this online using github.com? It is too much typing in a terminal.

https://www.sitepoint.com/quick-tip-sync-your-fork-with-the-original-without-the-cli/

Works great for me! I wonder if you could create a bash script that took the master and feature-branch names as arguments...

Works great for me too! Thanks

Super useful! Thanks

Very helpful thank you

Helpful. Thanks

helpful 👍

Very helpful, thank you

How this will work if I already have some changes in my branch and wanted to make it up to date with master before pushing my branch in git

@deepika0024-tech I believe you perform the same process as mentioned in the first post, but you might come across some conflicts like msureshb.

Can you do:

git checkout <feature-branch>
git fetch -p origin
git merge origin/master
git push origin <feature-branch>

If you don't want to update your local master branch?

Thank you, this helped me a lot today.

Great guide, solved my issue, thanks!

This is amazing, thank you so much!

During "git merge master" step,
I got conflict. I resolved the conflict by editing the files.
After that, How do i restart the merge process?

you need to git add <file> and then commit.
It will create a new merge commit. Completing you merge process

Really helped me. Thanks a lot.

Thanks !

This helped, thanks!