Skip to content

Github setup

Jump to bottom
perfk edited this page May 19, 2025 · 3 revisions
  1. Download Gitkraken https://www.gitkraken.com/
  2. Add your github account (https://help.gitkraken.com/gitkraken-desktop/github-gitkraken-desktop/)
  3. Fork the main branch from https://github.com/Global-Conflicts-ArmA/gc-reforger-missions
  4. Clone your forked repo to gitkraken (https://help.gitkraken.com/gitkraken-desktop/open-clone-init/)
  5. Add your forked repo to gitkraken (https://help.gitkraken.com/gitkraken-desktop/fork/)

Optional:

  1. Create a branch of your Master, name it the same as your mission. This makes it easy to work on multiple missions at the same time or put a mission idea on ice until you want to come back to it.

You should now be able to see any changes made to the GC repo, so you can easily rebase it onto your fork. (the alternative to this is to go to the github website and click the sync button)

To rebase just drag your branch onto the GC master branch. Here is an example where my Operation Stingray branch is behind the GC main branch gitkraken_PNpAqDxlnd Note how it now is in front of the Master, as it contains changes that have not been pushed to the Master as i'm still working on this mission. It's a good idea to always rebase when there are changes, as it limits the chance you will have a conflict when you want to do a pull request

GIT Merge vs Git Rebase

https://www.youtube.com/watch?v=0chZFIZLR_0 image

When able use Git Rebase

image https://drive.google.com/file/d/1cxCQ0OF8md8A206WbrRVDbHjvylBhks0/view?usp=sharing

Clone this wiki locally