ssh myserver
cd homework
mkdir lesson_5
cd lesson_5
git clone git@git.acwing.com:yxc/homework.git
ssh myserver
cd homework
mkdir lesson_5
cd lesson_5
git clone git@git.acwing.com:yxc/homework.git
git merge dev # 将dev分支合并到当前分支
vim readme.txt
***
111
333
555
444
***
git add .
git commit -m "fix conflicts"
git checkout master # 切换回master分支
vim readme.txt
***
111
333
555
***
git add .
git commit -m "add 555"
git checkout -b dev
vim readme.txt
***
111
333
444
***
git add .
git commit -m "add 444"
git push origin dev
git remote add origin git@git.acwing.com:yxc/homework.git
git push -u origin master
rm problem2 -r
mkdir problem3
cd problem3
vim main.cpp
***
#include <iostream>
using namespace std;
const int N = 1010;
int n, m;
int f[N];
int main()
{
cin >> n >> m;
while (n -- )
{
int v, w;
cin >> v >> w;
for (int j = v; j <= m; j ++ )
f[j] = max(f[j], f[j - v] + w);
}
cout << f[m] << endl;
return 0;
}
***
cd ..
vim readme.txt
***
111
333
***
git add .
git commit -m "many operations"
mkdir problem1 problem2
cd problem1
vim main.cpp
***
#include <iostream>
using namespace std;
int main()
{
int a, b;
cin >> a >> b;
cout << a + b << endl;
return 0;
}
***
cd ../problem2
vim main.cpp
***
#include <iostream>
using namespace std;
const int N = 1010;
int n, m;
int f[N];
int main()
{
cin >> n >> m;
while (n -- )
{
int v, w;
cin >> v >> w;
for (int j = m; j >= v; j -- )
f[j] = max(f[j], f[j - v] + w);
}
cout << f[m] << endl;
return 0;
}
***
cd ..
git add .
git commit -m "add problem1 problem2"
vim readme.txt
***
111
***
git add .
git commit -m "add readme.txt"