Bad news? That’s where git comes in handy and it will allow you to merge new changes from master branch. Just have to be a little careful with that.