189 was merged into master, now we need to figure out how to get it into development
Initially I stated that after a hotfix has been merged into master, then master should be merged into development, but there's a bit of a debate on this. So I think we're at a point where @gabriellesc and @michellemtchai should sit down with @jmzaleski and discuss what the process should be like that benefits developers and just not having to deal with Git nonsense.
Also it would be worth it to discuss the squashing issue, just so that it doesn't happen in the future.
There's a big difference between squash and merge, and rebase and merge. :+1:
gabriellesc
commented
7 years ago
189 was merged into master, now we need to figure out how to get it into development
Initially I stated that after a hotfix has been merged into master, then master should be merged into development, but there's a bit of a debate on this. So I think we're at a point where @gabriellesc and @michellemtchai should sit down with @jmzaleski and discuss what the process should be like that benefits developers and just not having to deal with Git nonsense.
Also it would be worth it to discuss the squashing issue, just so that it doesn't happen in the future. There's a big difference between squash and merge, and rebase and merge. :+1: