DEV Community

Buğra Gündüz
Buğra Gündüz

Posted on

What does your git workflow look like?

I've been trying to get a better understanding of git lately, but there are so many different opinions out there. What does your git workflow look like, and why?

Top comments (1)

Collapse
 
pkristiancz profile image
Patrik Kristian

When i am starting to work on something, i create separate branch, when my work consists of different stuff i create commits to separate diferent scopes. i often use parial adding thru cli. i make fixup commits to original commits when it is in scope want i want it together. i push often. after that i use interactive rebase to clear fixup commits. if i run into conflicts i verify my changes by diff with origin. this time i again verify contents of commits, polish commit messages and push once again, but with force. create pull request/rebase into master