I used a GIT repository two years ago. After this we made some changes from our side, but in most of the files we have not changed anything.
Now there are some fixes in the GIF repo of the base of which we had fork. As we keep our local changes continuous, we want to include those changes in the one behind us.
Is there any way to make a change in the recent repo in our Reka repo keeping our local changes?
If changes have been separated into their branch, then you can easily pull changes from the upstream repository You can.
git pull You note, this is a git fetch & amp; Amp; & Amp; GIT merge operation.
If you want to include these specific changes in your specific branch, you have to merge them through the git merge . With the change in a code base for more than two years, keep in mind, you will take part in opposing possible mergers. At that point, you have to find out what has changed in the new API from the old API and determine the best way to move forward.
No comments:
Post a Comment