-
-
Notifications
You must be signed in to change notification settings - Fork 446
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
added color documentation/FAQ-Section #126
Conversation
@Termuellinator Thanks a lot for the PR, but I think it would be better to use a placeholder image service to show the color. This will avoid having to keep images in the repo. Something like
will give you |
@meain that is indeed a more elegant solution, thank you - you never stop learning ^^ |
Hello @Termuellinator , Thanks a lot for this PR, it really great! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In order to keep the history clean, can you squash all your commit together please? There is a lot of "tests" commit which should be into the master.
3128d55
to
df1d7ff
Compare
I've learnt how to squash commits together now, but i think using --force wasn't the best idea to push...and now i can't seem to be able to squash away the merging commit (that was created by clicking on "merge branches" here in github), no matter which tutorial i try :/ i don't assume scrubbing this PR and creating a new branch+PR would be good practice, would it? |
@Termuellinator Force pushing is the way to go. Just reset the merging commit using
Now rebase it with master using.
I'm guessing upstream is the name that you have set for this remote. Now just force push the rebased commit |
8861c9e
to
415e34e
Compare
uhm - now i've got some of your commits in here?! O_o is that a problem or expected behaviour? |
@Termuellinator Oh, that went wrong, my bad. Could you just do a reset using the below command and force push the result.
|
that yields using just reset without --hard works, but yields no changes when pushing |
Could you show me the result of
|
415e34e (HEAD -> master, origin/master, origin/HEAD) switch to one line when not outputting to tty the strange thing is/was that i couldn't see the merger-commit in git log, even after fetch/pull/rebase yet git status says i've got the current master. |
@Termuellinator My bad I had edited the command, just after I posted the message. |
415e34e
to
df1d7ff
Compare
oh, OK, now i see the error in the reset-command i tried after your first suggestion. |
now do a rebase |
right, forgot about that one.
edit: oh, i got an idea...do i have to add this repository to the git-config file? |
upstream not origin |
df1d7ff
to
f4b6c47
Compare
that yields an error:
i used origin because of your "I'm guessing upstream is the name that you have set for this remote." now i've learned about remotes and added this one as upstream, now the rebase works and everything seems to finally be in order as far as i can see! :) thanks so much for your guidance! one more question for my understanding though: is adding the upstream-repo as a remote a standard procedure that should be done with every project? |
Yeah, I guess that's a thing people do. It's not like you have to, but you might end up needing it. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Thanks to you guys! Merged |
as per #120 i've added the colors i've found in /src/color.rs to the readme/FAQ.
Please check if i understood everything right in the code ;)