search

pez2001 / razer_chroma_drivers

A collection of Linux drivers for Razer Chroma devices, it supports all lighting modes and includes a daemon for advanced effects + gui configuration app
GNU General Public License v2.0
231 stars 31 forks source link

Refactored dynamic.c #78

Closed polprog closed 8 years ago

polprog commented 8 years ago

I refactored dynamic.c so the name convention is in English (sorry for that). Originally it was meant to be used in scripts, hence the lack of interactive mode.

terricain commented 8 years ago

Hmmmm, merge conflicts, joy. I'll have a look at it later unless pez beats me to it.

polprog commented 8 years ago

Sorry for merge conflicts, I am using git via terminal. I could not sync my fork with the original. This is my first ever collaborative programming, so I'm still learning. 29 sty 2016 11:52 "Terry Cain" notifications@github.com napisał(a):

Hmmmm, merge conflicts, joy. I'll have a look at it later unless pez beats me to it.

— Reply to this email directly or view it on GitHub https://github.com/pez2001/razer_chroma_drivers/pull/78#issuecomment-176691791 .

lah7 commented 8 years ago

It's likely because the repo has been renamed from razer_blackwidow_chroma_drivers to razer_chroma_drivers that's causing sync/rebase problems, plus has had a lot of changes. Consider updating your remote URLs.

terricain commented 8 years ago

@lah7 I believe GitHub redirects you to the new repo so old remotes should work.

terricain commented 8 years ago

Merged

polprog commented 8 years ago

So, how do i set the remotes? I did git clone my fork to my working dir. I currently have my fork set as origin for both fetching and pushing. What do i set to get my fork up to date with this one?

lah7 commented 8 years ago

To list all remotes in your repo: git remote -v

To add this one (called upstream): git remote add upstream https://github.com/pez2001/razer_chroma_drivers.git

If you need to rename it: git remote rename <old url> <new url>

To merge the latest commits into your master: git pull upstream master

But if I have no changes, I like to keep things clean by rebasing my copy of the repo with upstream, like it's a clean fork: git pull --rebase upstream master

I use git-cola as a GUI, makes things slightly easier. :wink: