Does anyone know a consultant who could help train us a bit on Git? I
thought I understood most of the basics, but something things get very
confusing and we need some help sorting things out.
For example today we created a new branch and made some commits to it. But
it shows that master is "id
Is master just a branch or is there anything special about it? If we delete
it, can we just create a new branch called master? Do we need to Rebase to
it or something to move the HEAD to it?
Somethings weird happened and we're trying to make things right again.
Somehow I have two branches calle
There are only 2 kinds of branches, local and remote branches. Master is a
local branch and coud be deleted or renamed or replaced by another branch
like "i_am_the_main_branch". It is just project naming convention.
Origin/master is a remote branch named master in the remote repository
named or
On Thursday, October 4, 2012 11:09:08 AM UTC+2, maxhodges wrote:
> Does anyone know a consultant who could help train us a bit on Git? I
> thought I understood most of the basics, but something things get very
> confusing and we need some help sorting things out.
>
I'd say you'd have a higher c
On Thu, 4 Oct 2012 02:12:19 -0700 (PDT)
maxhodges wrote:
> Is master just a branch or is there anything special about it? If we
> delete it, can we just create a new branch called master? Do we need
> to Rebase to it or something to move the HEAD to it?
It's just a regular branch, nothing specia
On Thu, 4 Oct 2012 15:14:27 +0400
Konstantin Khomoutov wrote:
[...]
> Second, what you're facing is probably because you have one remote
> branch, which is really "remotes/origin/branches" and one local
> branch, which is called "origin/master" -- you can see the difference
> by running `git bran
On Thu, 4 Oct 2012 03:27:02 -0700 (PDT)
Thomas Ferris Nicolaisen wrote:
[...]
> I find a great way to study the actual state of the current branches
> is with 'git log', more specifically with these parameters:
>
> git log --graph --oneline --decorate --all
>
> (You can configure an alias 'git
On Thu, 4 Oct 2012 03:27:02 -0700 (PDT)
Thomas Ferris Nicolaisen wrote:
[...]
> If you create a branch "search-label-issue" out from master, it is
> not necessarily given that the new commits are supposed to be merged
> back into master. It could be a throw-away experimental branch, a
> release b
other (none distributed) systems are certainly easier to learn. We were
fine with GIT for a few weeks, then suddenly our project is no longer
working as expected. Hope we can sort it out with a bit of professional
help.
On Fri, Oct 5, 2012 at 2:45 AM, Konstantin Khomoutov <
flatw...@users.source
