git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* Reverting merge commit
@ 2019-02-17 20:57 Roman Gelfand
  0 siblings, 0 replies; only message in thread
From: Roman Gelfand @ 2019-02-17 20:57 UTC (permalink / raw)
  To: git

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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2019-02-17 20:57 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-17 20:57 Reverting merge commit Roman Gelfand

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).