[git-users] error deleting branch after merging with squash

I upgraded my rails application in a dedicated `upgrading` branch, made two commits, then checkout to the master branch and merged with --squash option: $ git checkout -b upgrading $ git add -A $ git commit -m 'before rails app update' $ rails app:update $ git add -A $ git commit -m "work in

Re: [git-users] remote and remote-tracking branches

On Friday, March 4, 2016 at 12:29:58 PM UTC+1, Konstantin Khomoutov wrote: > > > It depends. If you really want to wipe out any mentions of that branch, > the third command is necessary too: the way remote-tracking branches > work is somewhat asymmetrical to normal branches in that if a

[git-users] remote and remote-tracking branches

Are they different objects? In the Git user manual it is written that "your local repository keeps branches which track each of those remote branches, called remote-tracking branches, which you can view using the -r option to