#DevDiscuss Archive | Participate

Time for the #DevDiscuss Twitter chat. Tonight's topic is `git workflow` ‌‌

Rules: - Stay on topic - ALWAYS ALWAYS Use hashtag #DevDiscuss - Be NICE/POSITIVE ❤️ - Quoting tweets for clarity is encouraged

Pahimar Mar 21 @ 9:07 PM EDT

It's time to "git gud" #DevDiscuss

ThePracticalDev Mar 21 @ 9:02 PM EDT

Time for the #DevDiscuss Twitter chat. Tonight's topic is `git workflow` ‌‌

jamesmk Mar 21 @ 9:07 PM EDT

For projects that don't require official releases our team uses what we dubbed “ENV branching” #DevDiscuss https://t.co/nVq3l1sCUO

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

Nick_Craver Mar 21 @ 9:10 PM EDT

Seriously though: git pull --rebase Don’t litter history with a bunch of useless merges that are more effort to revert. #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

BinaryIdiot Mar 21 @ 9:10 PM EDT

I've made some mistakes in the past that have cost me. Now I use @sourcetree to visually verify before I test any git command #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

kellyjandrews Mar 21 @ 9:11 PM EDT

Commit, Add, Branch, Checkout, Merge, Push, Pull are the basics. Add those to your profile as aliases to reduce repetition. #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

philibertdugas Mar 21 @ 9:11 PM EDT

I sync with master with "git fetch && git rebase origin/master" and when the branch is ready I use the alias "ggnore" to push #DevDiscuss 😅

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

bendhalpern Mar 21 @ 9:11 PM EDT

Git is an interesting tool. Everyone basically agrees they like it, but so many aren't sure if they reaaally know how to use it. #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

kellyjandrews Mar 21 @ 9:11 PM EDT

As long as it's only been local. Tends to get messy otherwise. #DevDiscuss

In reply to @Nick_Craver

MikeNGarrett Mar 21 @ 9:12 PM EDT

just in terms of tools, I'm addicted to @beanstalkapp and @gittower together. #DevDiscuss

In reply to @ThePracticalDev, @beanstalkapp, @gittower

kellyjandrews Mar 21 @ 9:12 PM EDT

Understanding the differences, and use cases, of git reset "--hard", "--soft". #DevDiscuss

burritonightcap Mar 21 @ 9:13 PM EDT

merge. conflicts. #frustration #devdiscuss

In reply to @ThePracticalDev

JeremiahMegel Mar 21 @ 9:13 PM EDT

Recently learned the `-v` flag for committing. Easy to see the exact changes I'm making. #DevDiscuss https://t.co/gjVhH94iMv

In reply to @ThePracticalDev

JeremiahMegel Mar 13 @ 8:52 PM EDT

`git commit -v`: Print a diff of your changes in the editor while writing a commit message. https://t.co/yFCUQvYU3r

klert Mar 21 @ 9:13 PM EDT

Just recently learned about excluding local files and it's great https://t.co/GrvHbk4WKF #DevDiscuss

kellyjandrews Mar 21 @ 9:13 PM EDT

Also - take time and understand the CLI over a GUI. You will thank yourself later. #DevDiscuss

kellyjandrews Mar 21 @ 9:14 PM EDT

Git Status - another one I use almost every minute. I created the alias "gs" #DevDiscuss

bendhalpern Mar 21 @ 9:14 PM EDT

PSA: You are still a "real developer" if you use a GUI instead of the command line. #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

kylewelch Mar 21 @ 9:14 PM EDT

Lots of feature branches. Alias for checkout and status. Favorite command git add -p = stage by chunk. Pruning is a must. #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

kellyjandrews Mar 21 @ 9:15 PM EDT

When you really start to understand things, the next step is getting deep with your config files. Makes things much cleaner #DevDiscuss

tblodt Mar 21 @ 9:16 PM EDT

if you’re using a git gui without understanding the internals of git, you should learn that before you fuck up #DevDiscuss

In reply to @bendhalpern

kellyjandrews Mar 21 @ 9:16 PM EDT

Correct - still a good person and all. But so much more power in the CLI to get yourself out of trouble. #DevDiscuss

In reply to @bendhalpern

NabilJesus Mar 21 @ 9:16 PM EDT

#DevDiscuss Sometimes –ours and -theirs could save A LOT of time during pulls and merges.

bendhalpern Mar 21 @ 9:16 PM EDT

I use the CLI, but I'd like to try some GUIs. If anyone could compare the GUI options on https://t.co/E4yHRJkeOg, please do! #DevDiscuss

kellyjandrews Mar 21 @ 9:17 PM EDT

If you find yourself using `reflog` back away slowly. #DevDiscuss

JTRinOR Mar 21 @ 9:17 PM EDT

.@ThePracticalDev Not true everywhere, but some teams REALLY like it if you squash commits with rebase to clean history #DevDiscuss

In reply to @ThePracticalDev

kylewelch Mar 21 @ 9:18 PM EDT

I love CLI, but there are times where having the visual is so nice. @GitKraken is an amazing for those use to CLI. #devdiscuss

In reply to @bendhalpern, @GitKraken

kellyjandrews Mar 21 @ 9:18 PM EDT

Github adding "squash and merge" to the app was so awesome. #DevDiscuss

In reply to @JTRinOR, @ThePracticalDev

xbuzz Mar 21 @ 9:19 PM EDT

🚀 git reflog #DevDiscuss

Nick_Craver Mar 21 @ 9:20 PM EDT

Tip: VS Code is an excellent git diff/pick client. For inline diffs, there are settings: "diffEditor.renderSideBySide": false #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

KathyApplebaum Mar 21 @ 9:20 PM EDT

This. I started with CLI, but now prefer the visual check of @sourcetree . Saved my bacon more than once. #devdiscuss

BinaryIdiot Mar 21 @ 9:10 PM EDT
I've made some mistakes in the past that have cost me. Now I use @sourcetree to visually verify before I test any git command #DevDiscuss
- ThePracticalDev Mar 21 @ 9:08 PM EDT
  
  What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

dev_vine Mar 21 @ 9:20 PM EDT

Fan of rebase over merge. Forgot to commit? --patch Forgot to add something? --amend #DevDiscuss

In reply to @ThePracticalDev

jamesmk Mar 21 @ 9:20 PM EDT

git pull --rebate is awesome. Beware of rebasing branches that diverged too much and endlessly resolving conflicts. #DevDiscuss

Nick_Craver Mar 21 @ 9:10 PM EDT
Seriously though: git pull --rebase Don’t litter history with a bunch of useless merges that are more effort to revert. #DevDiscuss
- ThePracticalDev Mar 21 @ 9:08 PM EDT
  
  What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

bendhalpern Mar 21 @ 9:20 PM EDT

Good git flow is in the eye of the beholder, that's why people tend to disagree on little things. #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

kellyjandrews Mar 21 @ 9:21 PM EDT

So many great tools for your terminal, and editors, make sure you look into them. No excuses working on the wrong branch. #DevDiscuss

ermontgo Mar 21 @ 9:21 PM EDT

.@ThePracticalDev Squashing pull requests onto our develop branch keeps everything much more organized #DevDiscuss

In reply to @ThePracticalDev

twarnock Mar 21 @ 9:22 PM EDT

Love git pull --rebate, get my money back every time 😁 #DevDiscuss

In reply to @jamesmk

LinuxBozo Mar 21 @ 9:22 PM EDT

git config --global alias.redo "commit --amend --no-edit" && git config --global alias.undo "reset --hard" #DevDiscuss

In reply to @ThePracticalDev

troycroz Mar 21 @ 9:22 PM EDT

If you use git diff and git log without heavy modifications, you are missing out. Alias them with lots of options #DevDiscuss #git

carlos_polar Mar 21 @ 9:22 PM EDT

cherry-pick. Useful command. #DevDiscuss

In reply to @ThePracticalDev

troycroz Mar 21 @ 9:23 PM EDT

#DevDiscuss #git # npm install -g diff-so-fancy alias diff="git diff --color | diff-highlight | diff-so-fancy"

In reply to @troycroz

joaquin_win Mar 21 @ 9:24 PM EDT

Don’t be scared of the branch. #DevDiscuss

dev_vine Mar 21 @ 9:24 PM EDT

👆👍👍 Dev'ing makes you a dev. Not b/c you use CLI nor your choice of editor/lang/framework. #DevDiscuss

In reply to @bendhalpern

kellyjandrews Mar 21 @ 9:24 PM EDT

A lesser know, but a fave of mine is `git cherry` which tells you the commits not upstream #DevDiscuss

In reply to @carlos_polar, @ThePracticalDev

mrskellyvaughn Mar 21 @ 9:25 PM EDT

git commit -m "I hope this works" #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

troycroz Mar 21 @ 9:25 PM EDT

#DevDiscuss #git git log --graph --pretty=format:'' --abbrev-commit --date=relative -15

In reply to @troycroz

kellyjandrews Mar 21 @ 9:26 PM EDT

Many projects use Gitflow and stick to it - which tends to reduce the issues of opinions. https://t.co/jObI0Z8x0R #DevDiscuss

Nick_Craver Mar 21 @ 9:27 PM EDT

But, you're an idiot if you refuse tooling that works great for you based on what others think. It’s YOUR TIME, optimize it. #DevDiscuss

bendhalpern Mar 21 @ 9:14 PM EDT
PSA: You are still a "real developer" if you use a GUI instead of the command line. #DevDiscuss
- ThePracticalDev Mar 21 @ 9:08 PM EDT
  
  What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

itsradditude Mar 21 @ 9:27 PM EDT

^#devdiscuss

Component_IO Mar 21 @ 9:28 PM EDT

If you find yourself typing same commands over & over (like git add / git commit -am "...") use an alias https://t.co/vxAC6aECuy #DevDiscuss

kellyjandrews Mar 21 @ 9:28 PM EDT

`alias glpretty=git log --pretty="%H - %an - %cr - %s" My current alias. Not terribly pretty, but works #DevDiscuss

In reply to @troycroz

SuchApple Mar 21 @ 9:29 PM EDT

Can confirm, I use @sourcetree for work #DevDiscuss

In reply to @sourcetree

bendhalpern Mar 21 @ 9:14 PM EDT
PSA: You are still a "real developer" if you use a GUI instead of the command line. #DevDiscuss
- ThePracticalDev Mar 21 @ 9:08 PM EDT
  
  What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

jamesmk Mar 21 @ 9:30 PM EDT

glad I don't use git on my phone 😂 #DevDiscuss

In reply to @twarnock

MetroNorthRider Mar 21 @ 9:30 PM EDT

when I have to think about source control then I've lost #devdiscuss

In reply to @ThePracticalDev

bryansrhodes Mar 21 @ 9:30 PM EDT

git commit -m "I think this is what was on stack overflow" #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

dev_vine Mar 21 @ 9:30 PM EDT

Today's #DevDiscuss reminded me of this old tweet which I'm still proud of. I kind of lost the thread there a bit but eh... beer!

dev_vine Feb 24 @ 8:14 PM EST

@github checkout beer pull glass --rebase checkout belly merge beer commit -am "ah" push glass Ordered Octopints! https://t.co/7qQ05ZtoP0
In reply to @github

kellyjandrews Mar 21 @ 9:32 PM EDT

My current alias list - ga, gc, gd, gf, gl, glpretty, gpick, gr, gs, pull, co, clone, push, stash #devdiscuss

jamesmk Mar 21 @ 9:32 PM EDT

git pull origin amster #DevDiscuss #GitTypos

Nick_Craver Mar 21 @ 9:32 PM EDT

I use a GUI for almost all commits, because I’m checking what I’m pushing. I use the CLI for actual push/pull/rebase, etc. #DevDiscuss

Nick_Craver Mar 21 @ 9:27 PM EDT
But, you're an idiot if you refuse tooling that works great for you based on what others think. It’s YOUR TIME, optimize it. #DevDiscuss
- bendhalpern Mar 21 @ 9:14 PM EDT
  
  PSA: You are still a "real developer" if you use a GUI instead of the command line. #DevDiscuss
  
  ThePracticalDev Mar 21 @ 9:08 PM EDT
  
  What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

with_lainnie Mar 21 @ 9:33 PM EDT

#git @ThePracticalDev Something went wrong? StackOverflow, Google, Cry etc... Fixed? Read the code of the commands you used! #DevDiscuss

In reply to @ThePracticalDev

aploch Mar 21 @ 9:33 PM EDT

confession: I haven't had to use git in the workplace until recently. I'm learning a lot. This is a good thread #DevDiscuss

In reply to @ThePracticalDev

TheGuru_107 Mar 21 @ 9:33 PM EDT

i use @sourcetree GUI. Makes the job a lot easier once you get use to it. No need to remember any command. #DevDiscuss

In reply to @ThePracticalDev, @sourcetree

Nick_Craver Mar 21 @ 9:33 PM EDT

If you’re not looking at what you’re pushing before doing it…what exactly would you say you do here? Don’t push unchecked code. #DevDiscuss

kellyjandrews Mar 21 @ 9:34 PM EDT

If it works for you, awesome. I've been on the other side of "gui with no clue" fixing issues. Oy. #DevDiscuss

In reply to @Nick_Craver

MetroNorthRider Mar 21 @ 9:34 PM EDT

I want to develop my app; not have to learn/think about ways to save my work. #devdiscuss

In reply to @ThePracticalDev

donnfelker Mar 21 @ 9:34 PM EDT

My .config (store as ~/.gitconfig) https://t.co/XKI1Bw6iEv (yes, it's not for everyone, but it makes me more productive) #DevDiscuss

bendhalpern Mar 21 @ 9:34 PM EDT

Same! But I really don't like the GitHub Mac app. Need something better. #DevDiscuss

Nick_Craver Mar 21 @ 9:32 PM EDT
I use a GUI for almost all commits, because I’m checking what I’m pushing. I use the CLI for actual push/pull/rebase, etc. #DevDiscuss
- Nick_Craver Mar 21 @ 9:27 PM EDT
  
  But, you're an idiot if you refuse tooling that works great for you based on what others think. It’s YOUR TIME, optimize it. #DevDiscuss
  
  bendhalpern Mar 21 @ 9:14 PM EDT
  
  PSA: You are still a "real developer" if you use a GUI instead of the command line. #DevDiscuss
  
  ThePracticalDev Mar 21 @ 9:08 PM EDT
  
  What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

kellyjandrews Mar 21 @ 9:35 PM EDT

That's what a PR is for. If you're pushing directly into master without a code review, you will have a bad day. #DevDiscuss

In reply to @Nick_Craver

gumnos Mar 21 @ 9:35 PM EDT

Though if you do, PLEASE poke under the hood and learn how your GUI editor is holding your hand. #devdiscuss

In reply to @bendhalpern, @ThePracticalDev

Nick_Craver Mar 21 @ 9:36 PM EDT

We push to master all the time, different teams have different flows. We’re building master a dozen times a day. #DevDiscuss

In reply to @kellyjandrews

kellyjandrews Mar 21 @ 9:36 PM EDT

Then you may appreciate this: https://t.co/BPbVagSMHF #devdiscuss

In reply to @bartschuijt

burritonightcap Mar 21 @ 9:36 PM EDT

cc @ThePracticalDev #devdiscuss

In reply to @ThePracticalDev

HenryHoffman Feb 1 @ 10:42 AM EST

I fucked up Git so bad it turned into Guitar Hero https://t.co/vUKZJAQKWg

aunyks Mar 21 @ 9:37 PM EDT

Since I do so many small commits all the time I find --squash to be the most useful command for keeping my project history clean #DevDiscuss

kellyjandrews Mar 21 @ 9:37 PM EDT

With no code review by peers? Trusting for sure. #devdiscuss

In reply to @Nick_Craver

itsradditude Mar 21 @ 9:37 PM EDT

I've been using 'git stash' a lot lately. Handy for those little half-baked ideas that don't pan out but might be useful later. #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

donnfelker Mar 21 @ 9:37 PM EDT

I alias git to just 'g' in my ~/.bash_profile: alias g="git" - All of my git commands look like `g s` = git status. #DevDiscuss

donnfelker Mar 21 @ 9:38 PM EDT

I alias all common commands. Sure its only 10-12 chars. Do that 100 time a day, 30 days. Well .. you get the point. #smallwins #DevDiscuss

kellyjandrews Mar 21 @ 9:38 PM EDT

By Master, I mean production, which isn't always the case. #devdiscuss

In reply to @Nick_Craver

jamesmk Mar 21 @ 9:38 PM EDT

Exactly, not as important if your commiting to a personal branch. A git diff before commit never hurts tho #DevDiscuss

In reply to @kellyjandrews, @Nick_Craver

itsradditude Mar 21 @ 9:38 PM EDT

Corollary: if you're learning to code, git CLI is an education unto itself! Even if you prefer a GUI in the long run #DevDiscuss

bendhalpern Mar 21 @ 9:14 PM EDT
PSA: You are still a "real developer" if you use a GUI instead of the command line. #DevDiscuss
- ThePracticalDev Mar 21 @ 9:08 PM EDT
  
  What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

JT_Grimes Mar 21 @ 9:39 PM EDT

There's a good argument to be made against aliasing core git commands: https://t.co/VB9O6BzEXJ by @gonedark summarizes. #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

kellyjandrews Mar 21 @ 9:39 PM EDT

You certainly should be looking at your own code before submitting - yes. #DevDiscuss

In reply to @jamesmk, @Nick_Craver

ahansondev Mar 21 @ 9:39 PM EDT

Having autocomplete in the terminal is a life saver, and I like to add the current branch name and status to my terminal prompt #devdiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

mwdowns Mar 21 @ 9:40 PM EDT

Learned git with CLI. Tried a couple GUI, but was scared by how they obfuscated what I was doing. Back to CLI. #DevDiscuss

kellyjandrews Mar 21 @ 9:40 PM EDT

A handy guide for those special moments with git - https://t.co/6raQRN3tFH #DevDiscuss

bendhalpern Mar 21 @ 9:41 PM EDT

Today, I happened to write about this little extension I like. #devdiscuss https://t.co/Zq7Gtdwno3

ahansondev Mar 21 @ 9:41 PM EDT

By "status" I mean an indicator for unstaged changes, and whether or not there is anything in the remote #devdiscuss

jxpx777 Mar 21 @ 9:41 PM EDT

I use @gittower to craft each commit to say one and *only* one thing. Large commits are an antipattern. #DevDiscuss https://t.co/x3KYfVRFDC

In reply to @gittower

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

kellyjandrews Mar 21 @ 9:41 PM EDT

I use Fish shell and have great auto complete as well. I really do like it. #DevDiscuss

In reply to @ahansondev

Zerquix18 Mar 21 @ 9:41 PM EDT

I recently discovered gitkraken and I'm in love. Everything is so easy. <3 #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

cechode Mar 21 @ 9:42 PM EDT

#DevDiscuss I use vizipi to find out who's the most qualified person to review my PR, sometimes it finds things I forgot to check in

jxpx777 Mar 21 @ 9:42 PM EDT

Then, I commit, push, pull, rebate, etc. on the command line. #DevDiscuss

dev_vine Mar 21 @ 9:43 PM EDT

Nice one. I just have to remember to do a 'stash list' every once in a while. That pile can add up. 😲 #DevDiscuss

In reply to @itsradditude

jxpx777 Mar 21 @ 9:44 PM EDT

I GPG sign every commit, so commit on command line is required if you don't want to use the Github app, which I find ponderous. #DevDiscuss

dev_vine Mar 21 @ 9:46 PM EDT

Keep seeing @GitKraken come up. I've wanted to use it for a long time. Mainly cuz of the name & style. 😁 #DevDiscuss

In reply to @Zerquix18, @GitKraken

kellyjandrews Mar 21 @ 9:46 PM EDT

create a side repo just for testing git flows out with. Things go wrong, just blow up, start over. #DevDiscuss

In reply to @bartschuijt

labjornson Mar 21 @ 9:46 PM EDT

'git add -i' has been a game changer for me. Allows for interactive staging of file and/or hunk. #DevDiscuss

In reply to @ThePracticalDev

neelima_konda Mar 21 @ 9:46 PM EDT

My git flow, pull -> branch ->(code to my heart's content) -> commit -> push😇 "cherry-pick" is my favorite #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

mattkahl Mar 21 @ 9:47 PM EDT

Want undo? `git reflog` makes mistakes less scary Tidying up pre-merge? Embrace `git rebase -i` ❤️ @gittower 👍 @priorarts's tig #DevDiscuss

In reply to @gittower, @priorarts

bartschuijt Mar 21 @ 9:48 PM EDT

Git workflow: - pull latest from git - develop code locally - pull latest from git - add, commit and push #DevDiscuss

Nick_Craver Mar 21 @ 9:48 PM EDT

Oh and please, for the sake of sanity: split out your formatting and cleanup into separate commits from your functional changes. #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

kellyjandrews Mar 21 @ 9:50 PM EDT

- pull master, create feature branch - code and commit - pull latest master into master - rebase local branch - push, submit PR #DevDiscuss

AntonFrattaroli Mar 21 @ 9:50 PM EDT

CLI is a ux antipattern #DevDiscuss

In reply to @bendhalpern

kellyjandrews Mar 21 @ 9:51 PM EDT

Turns out fitting my flow in a tweet is really f'ing hard. #DevDiscuss

colemanahoyt Mar 21 @ 9:52 PM EDT

git clone https://iBrokeTheProject.git #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

Nick_Craver Mar 21 @ 9:53 PM EDT

If your commit is a 2 line change buried in 400 lines of formatting, the reviewer is entitled to hunt you with a salad fork. #DevDiscuss

isholatosin Mar 21 @ 9:53 PM EDT

git commit -b -m "ESC route if feature don't work" #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

Component_IO Mar 21 @ 9:54 PM EDT

Never, EVER commit to production Friday before you're about to leave work #devdiscuss #hardlessons

jayrav13 Mar 21 @ 9:54 PM EDT

oh and uh, #devdiscuss :) ^^

In reply to @jayrav13

czhanacek Mar 21 @ 9:55 PM EDT

I push to a bare repo, bare populates a nonbare testing repo, production repo is reset to testing repo when testing works. #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

Israveri Mar 21 @ 9:55 PM EDT

Best git workflow that I tried to date: pull > branch > code away > squash to a well written single commit > open pull request #DevDiscuss

martinjdolan Mar 21 @ 9:56 PM EDT

`git diff filename` is especially useful when returning to an uncommitted repo a few days or weeks later. #DevDiscuss

In reply to @ThePracticalDev

Nick_Craver Mar 21 @ 9:57 PM EDT

New dev tip: the amount of time you spent working on a commit should be be reflected in the commit message length. #DevDiscuss

ThePracticalDev Mar 21 @ 9:08 PM EDT

What is your your git workflow like? What are your typical commands, patterns, aliases, habits, pro tips, frustrations etc. #DevDiscuss

MightyPupil Mar 21 @ 9:57 PM EDT

git add . && git commit -m "ugh" && git push -f #devdiscuss

In reply to @ThePracticalDev

dev_vine Mar 21 @ 9:58 PM EDT

well... unless.... #DevDiscuss

In reply to @Component_IO

Nick_Craver Mar 21 @ 9:58 PM EDT

If you spent a ton of time digging because of some complexity, then that should be explain for the next person in git blame. #DevDiscuss

Component_IO Mar 21 @ 9:59 PM EDT

ah yes the "launch and Logan" approach, very advanced! #DevDiscuss

In reply to @dev_vine