You are not logged in.

#1 2015-04-22 07:30:03

dragonauta
Member
Registered: 2012-05-15
Posts: 313
Website

Someone using github? Need some advice

Hi to all:

I'm planning to build an AB Theme just for the fun and because it will be incredible easy to set up a new system:
Just git clone on my $HOME folder and all should set up.

I thinking about
* Openbox + GTK2/3 theme
* dmenu theme
* tint2 theme
* Icons
* conky theme ? (probably, not by now)
* wallpaper ? (not really but could be added easily)

This is a desktop footage (actually it's how my desktops looks right now).
Would be using Ultra Flat Remix icons, Numix theme and some modifications to dmenu_bind.sh and tint2 configuration

Flat icons are on an external website; no problem, just copy&paste and done.
But Numix is a github project.
I could fork, but I don't know how to fork inside my project as a sub-folder.

Have another questions that I can't figure out because I never used github before.
Numix would be evolving... to keep bugfixes and such I should merge master branch with my fork: Will my changes persist or will be overwrited by originals?
My changes wouldn't be so huge, just some color codes here and there.

Looking for a GitHub for Dummies... I'm a little lost with so many words: commits, pull, push, merge...

Any recommendation? How to proceed?

Thanks!


***************** EDIT and UPDATE
Ok, github staff answer my question.
I need to use git submodule add to clone a project inside mine.

But I still need to know what to do with my changes and how will affect original changes to mine

Last edited by dragonauta (2015-04-22 07:59:31)


me
"Politicians and diapers need to be changed often ... and for the same reasons."

Offline

#2 2015-04-22 13:34:37

scjet
Member
From: Canada
Registered: 2010-12-01
Posts: 1,468

Re: Someone using github? Need some advice

Help is coming, with Mr.G, & Company, we're in good hands.
smile

Offline

#3 2015-04-22 14:48:37

Mr Green
Administrator
Registered: 2010-11-07
Posts: 6,920

Re: Someone using github? Need some advice

Create an account, set up a project, add a readme (instructions are shown when you create project name) then away you go.


Comments, suggestions please feel free to contact me mrgreen(at)archbang(dot)org

Offline

#4 2015-04-23 11:40:20

dragonauta
Member
Registered: 2012-05-15
Posts: 313
Website

Re: Someone using github? Need some advice

Thanks MrGreen, done that. In fact I joined github in 2011, but never used "seriously".
I was worried about changes on Numix upstream, but as I forked it will not change if don't pull requests.

I have this:
- my project with some own files
- a fork of Numix
- inside my project I added my Numix fork as a submodule (adding original Numix doesn't let me to edit)

Take a look: ArchBang Flat Theme


me
"Politicians and diapers need to be changed often ... and for the same reasons."

Offline

#5 2015-04-23 13:26:34

Mr Green
Administrator
Registered: 2010-11-07
Posts: 6,920

Re: Someone using github? Need some advice

Look forward too a PKGBUILD wink


Comments, suggestions please feel free to contact me mrgreen(at)archbang(dot)org

Offline

#6 2015-04-23 18:17:30

ncmprhnsbl
Member
From: australia
Registered: 2012-12-11
Posts: 114
Website

Re: Someone using github? Need some advice

i'm very much a git novice myself, but heres a stab at it...
from $man git-merge  :

MERGE STRATEGIES
       The merge mechanism (git merge and git pull commands) allows the
       backend merge strategies to be chosen with -s option. Some strategies
       can also take their own options, which can be passed by giving
       -X<option> arguments to git merge and/or git pull.

       recursive
           This can only resolve two heads using a 3-way merge algorithm. When
           there is more than one common ancestor that can be used for 3-way
           merge, it creates a merged tree of the common ancestors and uses
           that as the reference tree for the 3-way merge. This has been
           reported to result in fewer merge conflicts without causing
           mismerges by tests done on actual merge commits taken from Linux
           2.6 kernel development history. Additionally this can detect and
           handle merges involving renames. This is the default merge strategy
           when pulling or merging one branch.

           The recursive strategy can take the following options:

           ours
               This option forces conflicting hunks to be auto-resolved
               cleanly by favoring our version. Changes from the other tree
               that do not conflict with our side are reflected to the merge
               result. For a binary file, the entire contents are taken from
               our side.

               This should not be confused with the ours merge strategy, which
               does not even look at what the other tree contains at all. It
               discards everything the other tree did, declaring our history
               contains all that happened in it.

so #git-merge recursive ours
"This option forces conflicting hunks to be auto-resolved cleanly by favoring our version."

maybe? smile

Offline

#7 2015-04-24 01:19:58

pablokal
Administrator
From: Nijmegen, Holland
Registered: 2010-10-12
Posts: 3,634
Website

Re: Someone using github? Need some advice

Offtopic: for consistency shouldn't  you flatten the buttons and the tabs in the Numix theme?
Make a pkgbuild of your modified Numix theme, upload it somewhere and add it to AUR and your done.


Getting your questions answered here at ArchBang Forums
Please! Always give hardware info, if there is a chance that 's relevant: #lspci -vnn
On Arch(bang) and Openbox: http://stillstup.blogspot.com/

Offline

#8 2015-04-24 06:53:42

dragonauta
Member
Registered: 2012-05-15
Posts: 313
Website

Re: Someone using github? Need some advice

+1 @pablokal
That's why I started using github for this project.

Hmmmm... Maybe I should start a new theme based on


me
"Politicians and diapers need to be changed often ... and for the same reasons."

Offline

Board footer

Powered by FluxBB