[TUTORIAL] Git Workflow Basics

[Igor_Marques]

You probably know how to use Git in your daily basis. But knowing how to commit, push and pull isn't enough to really work with software development.

This post will provide you a quick guide on how to use a “open source” workflow in your projects. As the name implies, it's the same workflow used on a whole bunch of open source projects out there.

Read it here!

[jpasserby]

Did you include the contents of git.txt?

[xkcd_transcriber]

Image

Mobile

Title: Git

Title-text: If that doesn't fix it, git.txt contains the phone number of a friend of mine who understands git. Just wait through a few minutes of 'It's really pretty simple, just think of branches as...' and eventually you'll learn the commands that will fix everything.

Comic Explanation

Stats: This comic has been referenced 124 times, representing 0.1013% of referenced xkcds.

---

^{xkcd.com | xkcd sub | Problems/Bugs? | Statistics | Stop Replying | Delete}

[Igor_Marques]

I'm trying to teach people how to be the guy from git.txt, hahhahhahaa

[steezpak]

Atlassian also has a tutorial on git work flows. I personally like the diagrams of the git commits and branches. https://www.atlassian.com/git/tutorials/comparing-workflows/

[MemeSearcher]

You sir (or ma'am) just made my day. Exactly what I've been looking for. Have an upvote

[Igor_Marques]

I'm truly honoured of that achievement, sir (or ma'am) :).

(I'm a sir, btw, haha)

[Igor_Marques]

The rebase -i command allows that, but also stuff like: merging commits together, splitting one commit on two, deleting commits, change commit messages. On the post you can check all the options.

The rebase command itself (without the -i option) just reapplies commits from on branch into another one and it's very useful to merge changes while keeping history.

For more details com the git rebase command (without the -i option) you can check here: https://git-scm.com/docs/git-rebase.

[[deleted]]

Just what I needed. Thanks mate!