If you want to completely replace a branch by merging over another, the follow trick will help you, as it has helped me:
git checkout yourbranch
git merge -s ours master
git checkout master
git merge yourbranch
If you want to completely replace a branch by merging over another, the follow trick will help you, as it has helped me:
git checkout yourbranch
git merge -s ours master
git checkout master
git merge yourbranch
For further actions, you may consider blocking this person and/or reporting abuse
Bhupesh Varshney 👾 -
taijidude -
Jason Hornet -
Josef Andersson -
Once suspended, adamkdean will not be able to comment or publish posts until their suspension is removed.
Once unsuspended, adamkdean will be able to comment and publish posts again.
Once unpublished, all posts by adamkdean will become hidden and only accessible to themselves.
If adamkdean is not suspended, they can still re-publish their posts from their dashboard.
Once unpublished, this post will become invisible to the public and only accessible to Adam K Dean.
They can still re-publish the post if they are not suspended.
Thanks for keeping DEV Community safe. Here is what you can do to flag adamkdean:
Unflagging adamkdean will restore default visibility to their posts.
Top comments (0)