reset_rebase_conflits.sh 235 Bytes
Newer Older
1
2
3
4
5
6
7
git remote add origin https://gitlab.utc.fr/picasoft/formations/A18/tp-v2
git fetch
git checkout --quiet master
git reset --hard HEAD^
git checkout --quiet rebase_conflit
git reset --hard origin/rebase_conflit
git remote remove origin