Commits · master · typo3 / t3_deployment

29 Jun, 2017 4 commits
- fixed sibling renumbering · 434357a0
  Benjamin Baer authored Jun 29, 2017
  
  434357a0
- ups · c39500b2
  Benjamin Baer authored Jun 29, 2017
  
  c39500b2
- ups · 333518a3
  Benjamin Baer authored Jun 29, 2017
  
  333518a3
- Renumbering of FormElement Container · 6f8b8c06
  Benjamin Baer authored Jun 29, 2017
  
  6f8b8c06
15 Jul, 2016 12 commits
- cleaned up the delete script error messages · 93ed8e2f
  Benjamin Baer authored Jul 15, 2016
  
  93ed8e2f
- final step of new delete mechanics · 2777b4df
  Benjamin Baer authored Jul 15, 2016
  
  2777b4df
- sense in the chaos · 57e5546f
  Benjamin Baer authored Jul 15, 2016
  
  57e5546f
- found error · 0a85a1d4
  Benjamin Baer authored Jul 15, 2016
  
  0a85a1d4
- made output visible · eb71f6ba
  Benjamin Baer authored Jul 15, 2016
  
  eb71f6ba
- added second step of new deletion process · 91c2c7e8
  Benjamin Baer authored Jul 15, 2016
  
  91c2c7e8
- added test echos · 21cb798f
  Benjamin Baer authored Jul 15, 2016
  
  21cb798f
- First step of new delete Process included · 8a4869a3
  Benjamin Baer authored Jul 15, 2016
  
  8a4869a3
- Merge is needed, sorry · 2cc17958
  Benjamin Baer authored Jul 15, 2016
  
  2cc17958
- maybe merge isn't needed. · 4f62955d
  Benjamin Baer authored Jul 15, 2016
  
  4f62955d
- Trying to resolve renumbering · fa97cb06
  Benjamin Baer authored Jul 15, 2016
  
  fa97cb06
- Everything colored now. · 7b78c3ac
  Benjamin Baer authored Jul 15, 2016
  
  7b78c3ac
12 Jul, 2016 19 commits
- changed colors to the darker shade, to be better visible for white backgrounds · 69b9e433
  Benjamin Baer authored Jul 12, 2016
  
  69b9e433
- simplified done · c0a5868c
  Benjamin Baer authored Jul 12, 2016
  
  c0a5868c
- made the done stand out more · a9bee714
  Benjamin Baer authored Jul 12, 2016
  
  a9bee714
- changed question to blue · 27c9a630
  Benjamin Baer authored Jul 12, 2016
  
  27c9a630
- adding colored output and make question interrupt more obvious · 570caa23
  Benjamin Baer authored Jul 12, 2016
  
  570caa23
- branches werent going up. they should now · f425f845
  Benjamin Baer authored Jul 12, 2016
  
  f425f845
- strategy recursive theirs should be correct, ours keeps the changes in the... · a5913466
  Benjamin Baer authored Jul 12, 2016
```
strategy recursive theirs should be correct, ours keeps the changes in the trunk instead of the ones pushed
```
  a5913466
- uncommented the early pull · 47cf5084
  Benjamin Baer authored Jul 12, 2016
  
  47cf5084
- changed merge strategy to recursive xours · b2a9a984
  Benjamin Baer authored Jul 12, 2016
  
  b2a9a984
- added merge strategy "ours" · 091edcf0
  Benjamin Baer authored Jul 12, 2016
  
  091edcf0
- moved the commit up and removed a repeated pull · e55861a9
  Benjamin Baer authored Jul 12, 2016
  
  e55861a9
- partially restore old merge routine and mixing it with new · 1e1c41a1
  Benjamin Baer authored Jul 12, 2016
  
  1e1c41a1
- forgot to add gitrepo · eed75eb1
  Benjamin Baer authored Jul 12, 2016
  
  eed75eb1
- pull with rebase · 3e282f1b
  Benjamin Baer authored Jul 12, 2016
  
  3e282f1b
- pull with rebase · ea5a67ca
  Benjamin Baer authored Jul 12, 2016
  
  ea5a67ca
- little pull added · 6b16fc4a
  Benjamin Baer authored Jul 12, 2016
  
  6b16fc4a
- changed git handling again · 9c8da5a3
  Benjamin Baer authored Jul 12, 2016
  
  9c8da5a3
- fixed the git stuff · a2b0dc7a
  Benjamin Baer authored Jul 12, 2016
  
  a2b0dc7a
- git commit -a after moving temp · 4bbac6c6
  Benjamin Baer authored Jul 12, 2016
  
  4bbac6c6
08 Jul, 2016 5 commits
- fixed gitmerge issue - probably · 93e3faf7
  Benjamin Baer authored Jul 08, 2016
  
  93e3faf7
- gitmerge check got in again. removed · 7dc20ff2
  Benjamin Baer authored Jul 08, 2016
  
  7dc20ff2
- Now asks what to do with conflicting changes · 724866ab
  Benjamin Baer authored Jul 08, 2016
  
  724866ab
- Updated readme examples · 829cdc83
  Benjamin Baer authored Jul 08, 2016
```
Added a read function into CollisionHandler for testing
Corrected display_help in database_sync.sh
```
  829cdc83
- Updated readme examples · f2775d5a
  Benjamin Baer authored Jul 08, 2016
```
Added a read function into CollisionHandler for testing
Corrected display_help in database_sync.sh
```
  f2775d5a