git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Reverting merge commit

From
RGRoman Gelfand <rgelfand2@gmail.com>
Date
Feb 17, 2019, 20:57 UTC
Message-ID
<CAJbW+r=j2vwEUQArUdBUQL8FW1R7200Tw7sJqhgfP990CCCoGA@mail.gmail.com>
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
Message 1 of 1 in “Reverting merge commit”
  1. Roman GelfandFeb 17, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.