Reverting merge commit

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Consider the following...

1. Release Branch
2. Each of the 3 developers are working on their own features.  Each
feature is a branch.  Only one developer is working on each feature.
3. When a feature changes have been made, the feature branch is merged
into the release branch.
4. After the merge in 3., the developer working on this feature needs
to make more changes.  That could happen several times requiring more
merges.

Now, I need to remove the above feature from the release.  If there
was only one merge with the feature branch, in question, into the
release branch, the revert of that feature branch commit in release
branch is simple.  All that is needed is one revert.  However, if
there was ie... 5 merges from the same feature branch into release,
there has to be 5 reverts.

The question here is...  Based on the above requirements, what can be
done to remove a feature branch, from a release branch, once,
irregardless of how many times a feature branch was merged(each merge
has additional change(s)) with a release branch?

Thanks in advance



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux