any changes made locally before the merge are preserved, so you don't have to worry about losing any of your work when you do this.
Are you referencing this line?
I don’t think I had any commits in master when I put this together, but you bring up a good point. I think it would have been clearer if I had mentioned to checkout master before merging. I was just trying to say that any local changes anyone might have won’t be overwritten in the merge, but now that I think about it more, perhaps it wasn’t totally necessary for me to make that point.
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
Hey, great article :)
I am curious: you have different commits in your master compared to upstream because not using branches for your changes or something else?
Are you referencing this line?
I don’t think I had any commits in master when I put this together, but you bring up a good point. I think it would have been clearer if I had mentioned to checkout master before merging. I was just trying to say that any local changes anyone might have won’t be overwritten in the merge, but now that I think about it more, perhaps it wasn’t totally necessary for me to make that point.