How to merge commits previously rejected/reverted?

Question

I have a branch A that was previously merged into dev and later reverted due to some issues.

After a long time, I want to merge again that branch A on dev, but it's not updating the dev branch now. Instead it shows that Already updated.

How do I merge the commits from A to dev?

I have also tried to pull dev branch locally and merge them on A. But it overwrites the changes on A.

I know there are some hacky ways like copy pasting the changes. But there are a lot of changes and I want to know the proper way to do this.

See Reverting a git merge while allowing for the same merge later. — j6t
– j6t, Commented Oct 5, 2019 at 14:17

Sasidaran · Accepted Answer · 2019-10-06 11:14:10Z

1

You will have to do a "git revert" of the revert commit you performed on the branch A and then merge to dev branch

answered Oct 6, 2019 at 11:14

Sasidaran

681 silver badge7 bronze badges

Sign up to request clarification or add additional context in comments.

Comments

Acorn · Accepted Answer · 2019-10-05 14:16:47Z

You need to "revert the revert".

In other words, find the commit that reverted the original merge and revert that one.

However, in general you should avoid reverting a merge. See How to revert a faulty merge from the official docs for more details.

Collectives™ on Stack Overflow

How to merge commits previously rejected/reverted?

2 Answers 2

Comments

Comments

Linked

Hot Network Questions

Collectives™ on Stack Overflow

2 Answers 2

Comments

Comments

Linked

Related