| 04:24.27 | *** join/#arl pompy (~Mike@c-50-182-65-226.hsd1.nj.comcast.net) |
| 04:24.27 | *** mode/#arl [+v pompy] by ChanServ |
| 16:39.20 | *** join/#arl Ressy (Ressy@WoWUIDev/WoWAce/ARL/Ressy) |
| 16:39.20 | *** mode/#arl [+v Ressy] by ChanServ |
| 17:09.57 | Ressy | Torhal? |
| 17:10.10 | Torhal | Ressy? |
| 17:10.38 | Ressy | So how do I pull a commit from the main branch, to the Legion branch? |
| 17:10.58 | Torhal | ...a single commit? |
| 17:11.14 | Ressy | well.. I guess it'll be multiple going forward. |
| 17:11.38 | Ressy | Already set up the Legion branch, and frankly its nothing more than just changing TOC |
| 17:12.07 | Ressy | But, I'm still doing work on live branch |
| 17:12.12 | Torhal | Ok, the WoD branch is only on your local repository - doesn't exist in mine or on the remote. |
| 17:12.17 | Torhal | So you can nuke that. |
| 17:12.30 | Ressy | seriously? |
| 17:12.50 | Torhal | Well, you need to merge master into Legion. |
| 17:13.01 | Torhal | Anything you're doing on live needs to be merged into the branch, |
| 17:13.30 | Torhal | Yeah - there's no WoD branch on my copy or the remote copy for the Alchemy project. |
| 17:14.57 | Ressy | so git fetch -p should clear that up |
| 17:15.06 | Torhal | Should, yeah. |
| 17:16.29 | Ressy | uhh |
| 17:16.39 | Ressy | $ git branch -a |
| 17:16.39 | Ressy | * master |
| 17:16.39 | Ressy | <PROTECTED> |
| 17:16.39 | Ressy | <PROTECTED> |
| 17:16.39 | Ressy | <PROTECTED> |
| 17:16.40 | Ressy | <PROTECTED> |
| 17:17.09 | Ressy | For alchemy. |
| 17:18.03 | Ressy | $ git branch -D WoD |
| 17:18.03 | Ressy | error: branch 'WoD' not found. |
| 17:18.15 | Ressy | not local. |
| 17:18.50 | Torhal | https://www.dropbox.com/s/v1cq7lapsnemdc1/Screenshot%202016-04-20%2012.18.31.png?dl=0 |
| 17:19.15 | Torhal | ¯\_(ã)_/¯ |
| 17:19.46 | Ressy | just tried deleting the branch. |
| 17:19.52 | Ressy | and its not found. |
| 17:19.53 | Ressy | wtf |
| 17:20.00 | Torhal | Your shit be fucked, y0. |
| 17:20.04 | Ressy | lol |
