Comments (4)
gvwilson
commented on May 20, 2024
Which PR needs merged in lesson-template?
from git-novice.
iglpdc
commented on May 20, 2024
@gvwilson you just merged it :-) swcarpentry/DEPRECATED-lesson-template#183
from git-novice.
jdblischak
commented on May 20, 2024
@iglpdc, you can merge the CONTRIBUTING.md file into this repo by pulling the changes in the core branch of lesson-template. I'm not aware of this process being documented anywhere. Here's how I normally do it:
git remote add lesson-template [email protected]:swcarpentry/lesson-template.git
git checkout -b merge-core
git pull lesson-template core
# Fix any merge conflicts
git checkout gh-pages
git merge merge-core
git push swc gh-pages # swc is the swcarpentry repo, alternatively you can push to your fork and then submit a PR
from git-novice.
iglpdc
commented on May 20, 2024
Awesome, @jdblischak! Done. Thanks for the help.
Fixed by b7dcedc.
from git-novice.
Related Issues (20)
- GH settings screen shot is out of date
- Is there a supplemental SSH episode?
- We contradict our own advice about forgetting about ssh keys
- Suggest flipping order of git clone screenshots
- Share what to do if you already have an ssh key HOT 2
- Episode time allotment is inaccurate HOT 4
- Note that there is no response when typing password/pass phrase/etc in your terminal HOT 1
- "AFK" may not be a recognizable term to everyone
- README goes to the old lesson template
- Creating a new branch or renaming the default branch HOT 3
- Consider updating CONTRIBUTING to require forking regardless of privileges HOT 2
- Misleading Interplay between Episode 4 and 5 HOT 1
- file versions are not saved; changes to files are tracked/recorded HOT 1
- Add note about how rm from command line is irrecoverable HOT 1
- git config `core.autocrlf` option is incorrect
- Maintainer mismatch with website HOT 3
- Move SSH key creation (7.3) to Lesson 2 - Setting Up Git HOT 4
- Connect to preliminary material: Good Enough Practices HOT 3
- Do not mention branches while creating the first repository?
- Broken reference in citation episode
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from git-novice.