Skip to content

/ cf-scripts

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

Jump to bottom

pull before pushing #736

Merged
merged 3 commits into from Jan 25, 2020
Merged

pull before pushing #736

merged 3 commits into from Jan 25, 2020

Conversation

@CJ-Wright
Copy link
Member

@CJ-Wright CJ-Wright commented Jan 3, 2020

No description provided.

@CJ-Wright
pull before pushing
Loading status checks…
34ee555
@codecov-io
Copy link

@codecov-io codecov-io commented Jan 3, 2020 •
edited

Codecov Report

Merging #736 into master will decrease coverage by 0.15%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #736      +/-   ##
==========================================
- Coverage   40.58%   40.43%   -0.16%     
==========================================
  Files          16       16              
  Lines        2257     2263       +6     
==========================================
- Hits          916      915       -1     
- Misses       1341     1348       +7
Impacted Files Coverage Δ
conda_forge_tick/migrators/arch.py 36.06% <0%> (-2.92%) ⬇️
conda_forge_tick/migrators/core.py 76.45% <0%> (-0.65%) ⬇️
conda_forge_tick/auto_tick.py 0% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4405c71...f6f0102. Read the comment docs.
@CJ-Wright
Copy link
Member Author

@CJ-Wright CJ-Wright commented Jan 3, 2020

@mariusvniekerk what is the best way to resolve conflicts?
@scopatz
Copy link
Contributor

@scopatz scopatz commented Jan 5, 2020

You can use the thiers merge strategy
@jakirkham
jakirkham reviewed Jan 8, 2020
View changes
conda_forge_tick/cli.xsh Outdated Show resolved Hide resolved
@CJ-Wright @jakirkham
Update conda_forge_tick/cli.xsh
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
68cf60f 
Co-Authored-By: jakirkham <jakirkham@gmail.com>
@CJ-Wright
CJ-Wright reviewed Jan 8, 2020
View changes
conda_forge_tick/cli.xsh Outdated Show resolved Hide resolved
@CJ-Wright
Update conda_forge_tick/cli.xsh
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
f6f0102
@scopatz scopatz merged commit 504d05a into regro:master Jan 25, 2020
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@CJ-Wright CJ-Wright deleted the CJ-Wright:pull branch Jan 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakirkham jakirkham

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@CJ-Wright @codecov-io @scopatz @jakirkham