Comments (4)
It might be because weekTwo
is protected.
from software-training-old.
Looks like you're trying to merge weekTwo -> master, but weekTwo is behind master.
Master is also behind weekTwo.
Since both weekTwo and master are protected, we can't do anything about it on those two branches (unless you want to bypass them this time).
You probably want to make a branch at the commit where weekTwo is, merge master into that branch, and then merge that branch into master.
git checkout weekTwo
git checkout -b weekTwoMerging
git merge upstream/master
git push upstream weekTwoMerging
# open a PR
from software-training-old.
Gah. So many steps.
from software-training-old.
You can also turn off 'Require branches to be up to date before merging', which is the setting not allowing you to make that merge in, despite passing CI and reviews.
from software-training-old.
Related Issues (20)
- Week 5 topic slide improvements
- namespace
- Convert all solutions to protected zip file
- Make diagrams for week 1 git slides
- sloh7
- Week 3: Teach std::nth_element and finding array index from iterator
- week 2 future changes
- week 3 2018 changes checklist
- Project 1.3 changes HOT 1
- Missing nav2 dependencies
- Virtual Machine image needs updating HOT 2
- Unexpected nested tag(s) all projects launch .xml HOT 2
- WSL Setup Instructions command does not work for everyone HOT 4
- Inconsistent directory references between projects and setup guides.
- add comments to #pragma once
- Fix using C style headers
- Create example setup for linux tutorial Week 1
- Dynamic cast in week 4
- CircleCI for new training challenge HOT 1
- Week 4 typos HOT 1
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 software-training-old.