https://github.com/attack-monkey/xflow
POC for using an experimental branch in gitflow
https://github.com/attack-monkey/xflow
Last synced: about 1 month ago
JSON representation
POC for using an experimental branch in gitflow
- Host: GitHub
- URL: https://github.com/attack-monkey/xflow
- Owner: attack-monkey
- Created: 2019-07-13T20:48:54.000Z (over 6 years ago)
- Default Branch: master
- Last Pushed: 2019-07-13T21:54:19.000Z (over 6 years ago)
- Last Synced: 2025-09-02T00:43:30.017Z (7 months ago)
- Size: 6.84 KB
- Stars: 0
- Watchers: 0
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# xflow
POC for using an experimental branch in gitflow..
Create an X branch locally. If you push to remote - add your name to it.
Having an X branch allows you to work ahead on features while other features are in review. X branch is like a speculation of what develop will be at the time a new feature goes up for review.
That way when feature 1 gets approved, feature 2 will be waiting and the diff will be from the current dev branch.
It's not a mgic bullet - since if a change is made to a feature in review, any future features not yet on develop will need to have the changes 'merged-up'.
Merge-up means to merge the previous feature into the next feature, which continues until there are no more outstanding features. Now merge the latest feature branch into X - bringing it up to date with the changes.
> Note that some changes will cause conflicts - which is fine. This is to be expected because the previous story changed, and you have presumably made more changes on top of that. Carefully review what changes you want. You may want both and then do a refactor. You may want to keep the latest change.
Whenever a change occurs to dev - merge dev to X to keep it in sync.
When you create a PR for a feature, also merge straight into X - since this is the speculation that the feature has already been merged. Now branch off of X.
If you have another feature ready to PR but you want to wait for #1 - no problem - just push to #2 branch - but don't PR. Then again merge #2 into X, since we are speculating that this will be develop.
Now when #1 gets approved, you can immediately put #2 up for review.