git-branch

I'm following the the workflow described here , as I found many references pointing to this page as a good workflow. As mentioned in the article, "feature" branches are shared between developers, but do not go to the central repository. Let's say a developer "A" starts a new feature branch with git checkout -b newfeature develop . Now let's say that developer "B" needs also to work on this feature. This is my problem. What I did: developer "B" adds developer A's machine as a remote developer "B" runs git branch remoteA/newfeature developer "B" works on this branch, commit his work and pushes

As far as I know, commit object contains information only about parents, so if I have situation something like this: * branch-1 | o | o master | o which is some kind of equivalent of * branch-1 | o / o master | o but what if my master will go forward? o master | o * branch-1 | | o o |/ o | o being on branch-1, git log --graph --decorate will show me only: * branch-1 | o | o | o if I know from which branch I was started, I can call git merge-base master branch-1 , but what if I don't know from which branch I was started? PS. I am still learning English, however sometimes I am making stupid

I am working on a project and I have a central git repo. This project is a skeleton to be a baseline for a number of forks. Is it possible to configure my local working repository for a fork to track the central for the project as origin and track the skeleton's master as a separate branch named upstream tracking the master of the skeleton to cherry pick changes to the skeleton? I guess I want my workflow to be something like: Create Skeleton >> Fork Skeleton >> Skeleton Pulls Changes from Fork 2 >> Fork 1 Pulls Changes from Skeleton Is there a better process to do what I have described? Read

I've forked a repo and all of my work goes into that fork (my origin) and I merge branches upstream with pull requests. Pretty standard. But now there's a new branch in the upstream repo and I can't quite figure out how to get that new branch locally and then push it to my origin. Here is my situation. $ git remote show origin * remote origin Fetch URL: git@github.com:rackspace/jclouds.git Push URL: git@github.com:rackspace/jclouds.git HEAD branch: master Remote branches: 1.5.x tracked master tracked Local branch configured for 'git pull': master merges with remote master Local ref configured

These are the sequence of steps I have performed: committed my changes in branch to local master (commit id dc9afg2k ) git fetch origin master && git merge origin master git checkout master git pull (this pulled all recent changes) git fetch origin master && git merge origin master git reset --hard origin/master git checkout branch git blog git reset --hard dc9afg2k (commit successful) git checkout master git log (this was gone back to 2 days ago). git pull ( master is not updating with current origin/master ). VonC An out of sync master can happen when the remote repo has received a forced

Let's say I have a develop branch. I create a feature branch from this to develop a feature. Once the feature is developed, it is merged back into develop. Pretty much like shown here: Is there a way I can freeze the feature branch so that no further commits can be made to it? The reason for not outright deleting the branch is so that viewing the history can still show the feature branch and that if there needs to be a tweak made to the feature then it is possible for someone to create a new feature branch from the last commit of the previous feature. gjcamann Christopher is right, tagging

I have in my git repo, a file named xyz. Coincidently, I also have a branch named xyz. Presently I am on master, but I want to checkout to branch xyz. The command to be used is simple $ git checkout xyz But this would checkout the file xyz to the present HEAD. How would I change my branch to branch xyz ? As illustrated by commit a047faf (git 1.8.4.3+), you can also try: git checkout xyz -- (Note: the error message will be clearer with Git 2.21, Q1 2019 ) That would make clear that the xyz part is a branch or commit, while everything after -- must be a path (here no path is provided). See more