In git I have a feature-branch which I just rebased of master. There were many conflicts and it took me a couple of days to get the feature-branch up and running with the latest changes from master.
Recently some changes have been made to a single file, Readme.md, in master and my feature-branch is again out of sync and requires an update.
Is it possible to update my feature-branch with the latest changes in Readme.md, without doing an entire rebase (don’t want to go through the entire conflict resolution process again)?
4
Just read the current README into your current working tree:
git fetch
git restore --source master -- path-to-README
2
To rebase and keep feature branch changes whenever there is a conflict I used the merge strategy -Xtheirs
git checkout main
git pull cloud main
git checkout feature
git rebase main -Xtheirs
Successfully rebased and updated refs/heads/feature
1