Sunday | 23 JUN 2024
[ previous ]
[ next ]

Notes on Merging using Git

Title:
Date: 2023-09-28
Tags:  

I currently maintain and use a fork of ScarletDME that I'm working on. The core reason for the fork was to get big integer support and to then deploy my blog. This goal is currently fulfilled.

In the interest of speeding up the blog project, I developed and installed the 32 bit version.

ScarletDME has a 64bit version working in the dev branch so my goal was to merge my forked version with the upstream dev version.

Below are my notes, the entire process came from ChatGPT which was great. I handled the actual merge conflicts but damn was chatgpt helpful.

Add the remote upstream:

git remote add upstream https://github.com/geneb/ScarletDME.git

List remotes:

git remote -v

Get all the available branches:

git fetch upstream

List the branches:

git branch -v

Checkout the your branch, the branch that is the fork:

git checkout master

Test the merge without committing:

git merge --no-commit upstream/dev
``

To view the merge conflicts:

git status
Reading a merge file:

<<<<<<< HEADTHIS IS CONTENT IN THE CURRENT FORK=======THIS CONTENT IS IN THE UPSTREAM>>>>>>> upstream/dev