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
114 Views Asked by Ali Hassan At
1
There are 1 best solutions below
Related Questions in GIT
- Push mysql database script to server using git
- Git show's file path
- Git > diffs filtered, show only certain changed classes/files
- Pushing to git repository hosted by Visual studio online without entering user name and password
- How do I create my own Git branch to work on?
- Git init --bare giving error fatal: Out of memory? mmap failed: No such device
- Sub-directory into independent repository and later merge back into main repository
- How to find the Git Revision Hash in a synced SVN repo using SubGit?
- eclipse errors when try to change to master git branch
- How to have Heroku build my development branch on a staging server?
- Is "Merged in" a commit message created by bitbucket, or git?
- Git: Multiple projects under one directory
- Permission denied hg-git
- Is it possible to clone a private git repo without adding ssh keys
- Track file in master repository which is ignored in submodule
Related Questions in GITLAB
- I can push but not pull git
- Git first pull and push to master issue
- Can you create a project on GitLab using ssh?
- Adding A Certificate Authority in GitLab?
- GitLab shows deleted branches
- Files deleted with git filter-branch reappear after push and pull back
- Gitlab LDAP (Active Directory) Authentication without Server Side Access
- Cannot upgrade gitlab from 7.9.4
- GIT - Split working space by user (designer vs programmer)
- git diff not working on a bare repo, post-receive hook
- gitlab: Windows: How to use chmod and fix "Get Permission denied (publickey). fatal: Could not read from remote repository"
- git pull returns, fatal: protocol error: bad line length character: No s
- Custom post-receive hook with gitlab
- Installing GitLab CI Runner on Raspberry Pi 2 (Raspbian)
- From development to deployment with Git
Related Questions in GIT-BRANCH
- Tools for Apache Cordova - Installed Plugins are skipped in build
- git branch on another server
- Git: how to commit and cherry-pick bug fix?
- git push to remote, but don't create new branch
- Is it possible to rename an entire “directory of branches”?
- GitLab shows deleted branches
- Multiple streams over single project in Git?
- Git Command for a custom purpose
- How to create a new git branch from a messy working copy?
- Can I check out a git branch without removing other orphaned branches from my local files?
- Create branch afterwards, apply tags and use specific commit for both branches
- how to create multi-level remote branch in git?
- Compare committed revision with server one for the same branch
- How to import bugfix of master in all other branches without including the commits before?
- Advantages/disadvantages to branches and forks
Related Questions in TORTOISEGITMERGE
- Unable to use Diff Viewer & Merge Tool using TortoiseGit 2.13 and Beyond Compare 4.4.2
- Can TortoiseMerge be used as a difftool with Windows Git Bash?
- TortoiseGit - How to change encoding to koi8r?
- TortoiseGitMerge customization
- Git Branch Solution
- Git (via TortoiseGit) modifies compiled file when a conflict is detected making it corrupted
- How do I use tortoisegitmerge with mercurial?
- Webstorm External Merge tool
- What should I do when I get "TortoiseMerge cannot be used without a base"?
- Tortoise Git Merge Conflict Colors
- Using Git + TortoiseMerge, failing to load file into TortoiseMerge because of space in path name
- TortoiseGit un-checking the files will be submit the file to repository by default?
- git for Windows: tortoisegitmerge can only be launched from bash command line, but not git gui
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 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.