Skip to content

Conversation

@lrn86
Copy link
Contributor

@lrn86 lrn86 commented Aug 26, 2016

Closes #45

@sils sils self-assigned this Aug 26, 2016
a bug, just file `an issue <https://github.com/coala-analyzer/coala/issues>`__
and we will check it out!
and we will check it out. In case of long discussion, you should create
new issue with clearly defined task!
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't it be "a new issue"?

@sils
Copy link
Member

sils commented Aug 26, 2016

Hi,

it seems that your commit message doesn't contain enough information. Don't worry, most people don't know about good commit messages when they join us, including very experienced developers :) Standards vary from project to project.

The most important part is the first line of your commit message - maintainers will use it to read through a large number of commits and thus it's important that it's short but most importantly concise. I'd heartily recommend reading http://coala.readthedocs.io/en/latest/Getting_Involved/Writing_Good_Commits.html !

To change your message you just use git commit --amend and then git push --force the new commit to replace the old one.

Cheers!

@sils
Copy link
Member

sils commented Aug 26, 2016

Hey, I think you'll want to use Closes instead of Fixes - I'll talk about that in a few minutes in the workshop :)

@sils
Copy link
Member

sils commented Aug 26, 2016

you'll want to reference the issue, not the PR!

@lrn86 lrn86 changed the title Add information about long issue discussions Getting_In_Touch: Add information about long issue discussions Aug 26, 2016
@sils
Copy link
Member

sils commented Aug 26, 2016

ack 8a97fbd

@sils
Copy link
Member

sils commented Aug 26, 2016

@rultor merge

@rultor
Copy link

rultor commented Aug 26, 2016

@rultor merge

@sils1297 OK, I'll try to merge now. You can check the progress of the merge here

@rultor
Copy link

rultor commented Aug 26, 2016

@rultor merge

@ladaradon @sils1297 Oops, I failed. You can see the full log here (spent 12s)

+ head=git@github.com:coala-analyzer/documentation.git
+ head_branch=master
+ pull_id=88
+ pull_title='Getting_In_Touch: Add information about long issue discussions'
+ vars=('--env=fork=git@github.com:ladaradon/documentation.git' '--env=fork_branch=master' '--env=head=git@github.com:coala-analyzer/documentation.git' '--env=head_branch=master' '--env=pull_id=88' '--env=pull_title=Getting_In_Touch: Add information about long issue discussions')
+ image=yegor256/rultor
+ directory=
+ scripts=('echo "Nothing to do."' ';')
+ squash=false
+ ff=only
+ rebase=false
+ container=coala-analyzer_documentation_88
+ as_root=false
+ mkdir -p /home/rultor/.ssh
+ echo -e 'Host github.com\n\tStrictHostKeyChecking no\n'
+ chmod 600 /home/rultor/.ssh/config
+ git clone git@github.com:coala-analyzer/documentation.git repo
Cloning into 'repo'...
+ cd repo
+ git config user.email me@rultor.com
+ git config user.name rultor
+ '[' -z 'echo "Nothing to do."' ']'
+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'echo "Nothing to do."' ';'
+ rm -rf .gpg
+ cd repo
+ git remote add fork git@github.com:ladaradon/documentation.git
+ git remote update
Fetching origin
Fetching fork
From github.com:ladaradon/documentation
 * [new branch]      Makman2/linterups -> fork/Makman2/linterups
 * [new branch]      master     -> fork/master
+ args=
+ '[' only == default ']'
+ '[' only == no ']'
+ '[' only == only ']'
+ args=' --ff-only'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ git show-branch __rultor
++ wc -l
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/master
Switched to a new branch '__rultor'
Branch __rultor set up to track remote branch master from fork.
+ git checkout -B master origin/master
Switched to and reset branch 'master'
Branch master set up to track remote branch master from origin.
+ '[' false == true ']'
+ '[' false == true ']'
+ git merge --ff-only __rultor
fatal: Not possible to fast-forward, aborting.
'cid' file is absent, container wasn't started correctly

@AsnelChristian
Copy link
Member

@rultor merge

@rultor
Copy link

rultor commented Aug 26, 2016

@rultor merge

@AsnelChristian OK, I'll try to merge now. You can check the progress of the merge here

@rultor
Copy link

rultor commented Aug 26, 2016

@rultor merge

@AsnelChristian @ladaradon Oops, I failed. You can see the full log here (spent 11s)

+ head=git@github.com:coala-analyzer/documentation.git
+ head_branch=master
+ pull_id=88
+ pull_title='Getting_In_Touch: Add information about long issue discussions'
+ vars=('--env=fork=git@github.com:ladaradon/documentation.git' '--env=fork_branch=master' '--env=head=git@github.com:coala-analyzer/documentation.git' '--env=head_branch=master' '--env=pull_id=88' '--env=pull_title=Getting_In_Touch: Add information about long issue discussions')
+ image=yegor256/rultor
+ directory=
+ scripts=('echo "Nothing to do."' ';')
+ squash=false
+ ff=only
+ rebase=false
+ container=coala-analyzer_documentation_88
+ as_root=false
+ mkdir -p /home/rultor/.ssh
+ echo -e 'Host github.com\n\tStrictHostKeyChecking no\n'
+ chmod 600 /home/rultor/.ssh/config
+ git clone git@github.com:coala-analyzer/documentation.git repo
Cloning into 'repo'...
+ cd repo
+ git config user.email me@rultor.com
+ git config user.name rultor
+ '[' -z 'echo "Nothing to do."' ']'
+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'echo "Nothing to do."' ';'
+ rm -rf .gpg
+ cd repo
+ git remote add fork git@github.com:ladaradon/documentation.git
+ git remote update
Fetching origin
Fetching fork
From github.com:ladaradon/documentation
 * [new branch]      Makman2/linterups -> fork/Makman2/linterups
 * [new branch]      master     -> fork/master
+ args=
+ '[' only == default ']'
+ '[' only == no ']'
+ '[' only == only ']'
+ args=' --ff-only'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ git show-branch __rultor
++ wc -l
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/master
Switched to a new branch '__rultor'
Branch __rultor set up to track remote branch master from fork.
+ git checkout -B master origin/master
Switched to and reset branch 'master'
Branch master set up to track remote branch master from origin.
+ '[' false == true ']'
+ '[' false == true ']'
+ git merge --ff-only __rultor
fatal: Not possible to fast-forward, aborting.
'cid' file is absent, container wasn't started correctly

@AsnelChristian
Copy link
Member

check #91 :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

4 participants