[WIP] - git workflow #4
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Created document with example workflow, will continue editing and create a pull request for review before merging into master.
|
hmm. I have no strong opinion. It is upto you guys. |
frickerik
reviewed
Oct 30, 2018
frickerik
reviewed
Oct 30, 2018
|
I don't have a ton of experience in version-management using Git so I'm glad we have Jesper on our team! :) The suggestion sounds good; although I think it will take everyone some time to learn the ropes. (Or me atleast) |
Co-Authored-By: konglobemeralt <[email protected]>
Co-Authored-By: konglobemeralt <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Started working on a document wihich outlines suggestions for future workflow.
Some points of discussion
Merge Vs. Rebase
Playstation vs Xbox? Tabs vs Spaces?
I have personally mainly used Rebase, but neither will produce drastically different results. Might be harder to use rebase for beginners so perhaps Merge is better? Any preferences? 😃
Feature branches and Working Branches
Perhaps working branches are a bit overkill, to me this would depend on how much two people would be working on the same thing or not. It adds a bit of work that might not be really necessary, but it could also make work easier. Perhaps leave until it becomes relevant?