Comments (36)
- Best practices for branching, pull requests and naming.
- Git-Flow? Yes or no.
- Fixing mistakes in commits. rollback to commit. Roll out branch commit. etc.
from advanced-06-09-15.
Dealing with 'flawed' commits, ie:
- Amending commit messages in pushed commits.
- Reverting a commit that is not the latest commit.
from advanced-06-09-15.
Rebase vs Merge workflows
from advanced-06-09-15.
Webhooks & CI integrations
from advanced-06-09-15.
Our process requirements are to allow SWE and QE to collaborate and to ensure that only tested code goes into production. Our team develops server-side code, which currently must be deployed on well-known endpoints for client integration and testing, so having different server endpoints per branch is not an option. We've worked out a process that solves for all these requirements by using a "master" branch for releases, a "develop" branch for testing, and as many "feature" branches as there are SWEs developing features. I'd like to know if there is a "better" way.
Our current process:
- ensure local master is up to date wrt origin/master
* git pull origin master - create local feature branch off master
* git branch - make changes to local feature branch and commit git
* git commit -m "commit message" - push changes from local feature branch to remote feature branch
* git push origin - switch to develop
* git checkout develop - merge local feature branch into develop
* git merge - resolve any conflicts and push changes to origin develop
* git push origin develop
* a CI build deploys the service artifact to maven Nexus repo and to dev server environment - create pull request for remote feature branch to master and assign to QE.
- QE deploys artifact from maven to QA environment and adds more tests to the same feature branch as necessary
* QE also commits, and pushes tests to origin
* QE also merges tests from local feature branch into develop - Once QE is satisfied with tests
* If there are any conflicts then they must be resolved by the SWE and repeat from step 3.
* Finally, QE merges the pull request from the feature branch into origin master. - Release builds are made from master, and only have tested code.
from advanced-06-09-15.
Understanding Refs: relative refs, refspecs, special refs, packed refs, etc.
from advanced-06-09-15.
All of these are on the command line:
How do I see all commits by a certain person?
How do I see all commits in a certain directory (by a certain person)?
How do I see all the commits on a certain file?
How do I rename a file?
How do I rename a directory?
How do I move a file?
How do I move a directory?
How do I revert a commit?
How do I revert a merge?
How do I revert a single file to a previous revision/date-time?
How do I revert an entire directory to a previous revision/date-time?
How do I get source of all files to a given timestamp?
How do I get source of a certain directory at a given timestamp?
How do I do dry runs that donβt change the repo for all commands? (like -n in Perforce)
How do I see what will change locally before I do a fetch/pull?
How do I see what will change remotely before I do a push?
How do I only fetch/pull a certain directory or file?
How do I only push a certain directory or file?
How do I make a tag?
How do I get all source at a certain tag?
How do I get source of a directory at a certain tag?
How do I clone a repo without history?
How do I diff two (remote) branches on the command line?
How do I stash changes and bring them back?
How can I share my stashed changes with someone else?
How do I switch branches with unstaged or committed files?
How do I abort a merge?
How do I abort a commit?
How do I abort staging?
How do I see deleted files or directories?
How do I bring back a deleted file or directory?
What is a hard reset?
What is a soft reset?
How do I create a pull request on the command line?
from advanced-06-09-15.
Automatic Fork Syncing.
Granular permissions on release branches.
from advanced-06-09-15.
Merge v/s rebase, using reflogs to find lost work after a terrible terrible merge conflict, hard reset.
from advanced-06-09-15.
Integrating changes to multiple branches
Reset a particular commit.
Creating a branch from a particular commit.
from advanced-06-09-15.
Please add me to this repo
from advanced-06-09-15.
hello world
from advanced-06-09-15.
meow
from advanced-06-09-15.
Yinz
from advanced-06-09-15.
derp
from advanced-06-09-15.
please add me
from advanced-06-09-15.
woo
from advanced-06-09-15.
a
from advanced-06-09-15.
Hello
from advanced-06-09-15.
hey hey
from advanced-06-09-15.
please add me
from advanced-06-09-15.
add
from advanced-06-09-15.
please add me too
from advanced-06-09-15.
http://www.pinkbike.com/news/video-manon-carpenter-fort-william-saga-2015.html
from advanced-06-09-15.
helloworld
from advanced-06-09-15.
add
from advanced-06-09-15.
Pretty please!?
from advanced-06-09-15.
@vsriram2011 please add
from advanced-06-09-15.
add
from advanced-06-09-15.
add
from advanced-06-09-15.
for @bcampagnolo https://www.youtube.com/watch?v=oHg5SJYRHA0
from advanced-06-09-15.
add me
from advanced-06-09-15.
request push capability
from advanced-06-09-15.
request push, thanks!
from advanced-06-09-15.
Please add me..thanks!
from advanced-06-09-15.
Workflow strategies used by teams
from advanced-06-09-15.
Related Issues (4)
- Advanced Class ideas HOT 1
- can not push HOT 1
- request push capability HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
π Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. πππ
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google β€οΈ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from advanced-06-09-15.