Fabio wrote on 4/03/2020:
Forks are nice. Using forks we can eat spaghetti, potatoes, olives and also, we can develop Tiki!
I know that should be straightforward creating branches in main repository,but that makes a little mess on subgit bridge and SourceForge branches folder.
So, if you don't mind creating branches in a fork, it would be awesome.
You don't even need a separate folder for your fork. Use the Tiki folder you already have.
Let's say I'm creating Tiki mustache. But cloned from main repository and the mustache will take some time to make it beautiful. I need a branch.
1) Create a fork (my fork is git at gitlab.com:fabiomontefuscolo/tiki.git)
2) Add your fork as a remote to your local repository
>> git remote add fabio git at gitlab.com:fabiomontefuscolo/tiki.git
3) Create the branch you need
>> git checkout -b cowboy-mustache
4) Work, make commits .. if your branch lasts for more than one day ... update it getting changes from origin (the main repository). Let's say I branched from master, I get updates from master.
if you already pushed cowboy-mustache in the past:
>> git fetch origin
>> git merge origin/master
OR
if your branch is just a local branch
>> git fetch origin
>> git rebase origin/master
5) Save it to your forked repo
>> git push -u fabio cowboy-mustache
6) Mustache is ready, send it to main repository
If you want to open a MergeRequest, do it in Gitlab pannel
OR
If you want to send it directly to main git repository
>> git checkout master
>> git merge cowboy-mustache
>> git push origin master