zsh history
2264 git clone [email protected]:vladdenisov/KotlinAsFirst2020.git // clone project
2267 cd KotlinAsFirst2020 // go to project folder
2268 git remote add upstream-my [email protected]:vladdenisov/KotlinAsFirst2021.git // add my solutions
2269 git checkout -b backport // create branch backport
2270 git cherry-pick d535f35..FETCH_HEAD
2271 git cherry-pick d535f359..FETCH_HEAD // forgot to fetch
2272 git fetch upstream-my // fetch my repo
2273 git cherry-pick d535f359..FETCH_HEAD // pick commits
2274 git remote add upstream-theirs [email protected]:argraur/KotlinAsFirst2021.git // add theirs upstream
2275 git fetch upstream-theirs // fetch theirs repo
2276 git checkout master // use master branch
2277 git merge backport upstream-theirs/master // start merging
2278 code . // Merge files & commit merging in VSCode
2279 git log
2280 git remote -v > remotes.txt // create remotes.txt
2281 git log
2282 touch howto.md // create howto.md
Next will be:
git add howto.md remotes.txt
git commit -m "project: add howto"
git push