I take it you are having trouble merging update
into master
, since update
was previously merged into master
, and then had those changes reverted (and then committed and pushed). If that's the case, you need to revert the revert (and then if you have further changes in update
, you can then merge those in normally thereafter).
Look in git log
, find the commit which reverted the merge. Revert that specific commit within the master
branch:
git revert SHA1