Home/ Questions/Q 3997192
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-20T07:22:19+00:00

I have my own feature branch that I’ve added to a code using git.

  • 0

I have my own feature branch that I’ve added to a code using git. Unfortunately, updates for the main code come frequently, and have no version control. I get raw source code each time.

What is the proper way to update my feature branch with the newer version of the code? I have no history showing how the code was updated…

So: Is there a command to bring in the newer raw source code into the master branch and then automatically merge all files that I have not touched, but that have been updated?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    Create a branch (called whatever you want, maybe “vendor”), and commit each new version of the source code you get into that branch. Git will figure out what’s different between the new code and the previous one, and then you can merge it into your code:

    git checkout master
git merge vendor

    It will be easiest if you start with the original source that you started modifying (ie. your first commit into Git), and branch the “vendor” branch from that point.

    • 0