I'm facing an issue regarding git branch. I have a branch called F-branch where I want to develop new code and new features. And Later on, this is to be merged into the master branch. After merging to master, I got to realize that I just need the feature 1,3 and 4 rest of them are not required. And I need a minimum of rollbacks.
What would be the strategy should I adapt to fix this? One strategy would be not to merge all the features until all the features are developed. And after that, we cherry pick the features and merge them into the master.
I've attached a photo that explains everything.
I really appreciate your input.
Git Branch Solution
118 Views Asked by Ali Hassan At
1
There are 1 best solutions below
Related Questions in GIT
- problem to push files on a repository git
- diff3 output in git conflict style, including mergeable hunks
- Git Not In Sync with Local Branch
- Setting up the version control of .dotfiles while the .config is connected to a forked repo
- How to fix overriding the main branch in Git?
- I can't add text to "Message" in VS Code when committing to Git
- How can i redirect pull request from main branch to another branch
- Xcode commits (possibly outside of any branch) disappeared, how to get them back?
- Git/TortoiseGit : how to apply ONLY the changes from ONE commit from branch A, to branch B?
- How can I reintroduce username an password on git using fedora?
- GIT SKIP EMPTY DIRECTORIES
- Git smudge run once per checkout or per commit?
- I can't find ~/.profile or ~/.bashrc in C:/Users/<user>/.ssh folder
- Set environment variable during push for GitHub Actions
- Android WebRTC compile
Related Questions in GITLAB
- There are no active runners online GitLab
- Error rising in gitlab configuration file
- Git commit asks for passphrase which I don't remember
- On Gitlab, is there a way to allow Maintaners to merge MRs even if some checks fail?
- Jenkins pipeline script: Accept merge request from Gitlab
- How to integrate GitLab code into SAP DataServices job?
- How to use dynamic value for start_in using environment variable in gitlab pipeline child job
- Replace React Variables in build folder before serving the build by express Server
- Gitlab CI/CD pipeline not destroying created Terraform created resources
- DevOps Preference: Point Solutions or Single Platform?
- GitLab release-job creates a release where asset is artifacts.zip instead of concrete file
- How to run particular jobs in GitLab CI/CD via GitLab API?
- How to start from a clean stage after maven release job fails in GitLab pipeline?
- Gitlab 16.10: The scheduler failed to assign job to the runner, please try again or contact system administrator
- Gitlab-runner cann't connect to gitlab server
Related Questions in GIT-BRANCH
- Git refusing to commit
- Git branch name sometimes displayed in-line in terminal affecting the actual code?
- Move committed changes from one file into new branch in git
- How do I move some modifications from a feature branch into the main one?
- Git log of a specific branch already merged
- Why my wsl ubuntu's default git branch is Master?
- How to remove Git branches that give an error "does not point to a valid object"
- Git feature branch dragged on too long
- To create a branch from a git tag is a good practice?
- Is it safe to rebase remote branch if nobody based work on it?
- Git Pages: How to link a script file (or any other files) from a branch into the main branch
- Is there a way to restrict branch creation pattern in github?
- Git rebase to squash commits reverts local to several commits prior
- Are commits from local branches that aren't pushed accessible at the remote?
- I received Pull Request in GitHub from contributor. But I'd like to make some changes to it. How to do that and still give him credit when merging?
Related Questions in TORTOISEGITMERGE
- TortoiseGit - How to change encoding to koi8r?
- Unable to use Diff Viewer & Merge Tool using TortoiseGit 2.13 and Beyond Compare 4.4.2
- TortoiseGit un-checking the files will be submit the file to repository by default?
- Git (via TortoiseGit) modifies compiled file when a conflict is detected making it corrupted
- Git Branch Solution
- git for Windows: tortoisegitmerge can only be launched from bash command line, but not git gui
- Webstorm External Merge tool
- TortoiseGitMerge customization
- How do I use tortoisegitmerge with mercurial?
- Tortoise Git Merge Conflict Colors
- Using Git + TortoiseMerge, failing to load file into TortoiseMerge because of space in path name
- What should I do when I get "TortoiseMerge cannot be used without a base"?
- Can TortoiseMerge be used as a difftool with Windows Git Bash?
Trending Questions
- UIImageView Frame Doesn't Reflect Constraints
- Is it possible to use adb commands to click on a view by finding its ID?
- How to create a new web character symbol recognizable by html/javascript?
- Why isn't my CSS3 animation smooth in Google Chrome (but very smooth on other browsers)?
- Heap Gives Page Fault
- Connect ffmpeg to Visual Studio 2008
- Both Object- and ValueAnimator jumps when Duration is set above API LvL 24
- How to avoid default initialization of objects in std::vector?
- second argument of the command line arguments in a format other than char** argv or char* argv[]
- How to improve efficiency of algorithm which generates next lexicographic permutation?
- Navigating to the another actvity app getting crash in android
- How to read the particular message format in android and store in sqlite database?
- Resetting inventory status after order is cancelled
- Efficiently compute powers of X in SSE/AVX
- Insert into an external database using ajax and php : POST 500 (Internal Server Error)
Popular # Hahtags
Popular Questions
- How do I undo the most recent local commits in Git?
- How can I remove a specific item from an array in JavaScript?
- How do I delete a Git branch locally and remotely?
- Find all files containing a specific text (string) on Linux?
- How do I revert a Git repository to a previous commit?
- How do I create an HTML button that acts like a link?
- How do I check out a remote Git branch?
- How do I force "git pull" to overwrite local files?
- How do I list all files of a directory?
- How to check whether a string contains a substring in JavaScript?
- How do I redirect to another webpage?
- How can I iterate over rows in a Pandas DataFrame?
- How do I convert a String to an int in Java?
- Does Python have a string 'contains' substring method?
- How do I check if a string contains a specific word?
Your problem has nothing to do with git. You have a broken project management process.
A functional PM process should asure that you only develope features, that are really reuqsted by your clients (and payed for). Some agile methods like Scrum or Kanban have worked out sucessfully for quite a lot of enterprizes.
But git may offer a work around: You can "revert" commits like this:
Git will create new commits and apply the opposit changes.